[kaffe] Patch: Merge of Classpath glue code for assertion framework

[Benja Fallenstein]

This is a multi-part message in MIME format.
--------------030503090208050005090102
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Dalibor Topic wrote:
> --- Benja Fallenstein <b.fallenstein@gmx.de> wrote:
>>today I had a problem with a dependency using log4j, because log4j would 
>>try to use Class.desiredAssertionStatus() -- a 1.4 method that is part 
>>of the assertion framework. Since the library I depended on initialized 
>>log4j statically, my test suite wouldn't even start. To fix the problem, 
>>I merged the corresponding GNU Classpath code into Kaffe-- not actually 
>>implementing the whole assertion framework though, just the methods in 
>>Class and ClassLoader :-)
>>
>>I was hoping this could be useful for Kaffe?
> 
> sure! thanks a lot for the patch, I'll change the class version handling code
> in the class loader to stop printing an error message for java 1.4 class files.

Cool!

I've noticed one omission on my part though: java.lang.AssertionError 
was also introduced in 1.4 and may be depended on by libs using the 
assertion-related methods-- probably want to have this too. This was 
missing from the diff because it has not been entered into CVS 
(obviously). Sorry.

- Benja

--------------030503090208050005090102
Content-Type: text/x-java;
 name="AssertionError.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="AssertionError.java"

/* AssertionError.java -- indication of a failed assertion
   Copyright (C) 2002 Free Software Foundation, Inc.

This file is part of GNU Classpath.

GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
General Public License for more details.

You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING.  If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.

Linking this library statically or dynamically with other modules is
making a combined work based on this library.  Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.

As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module.  An independent module is a module which is not derived from
or based on this library.  If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so.  If you do not wish to do so, delete this
exception statement from your version. */


package java.lang;

/**
 * An assertion error normally occurs as a result of the <code>assert</code>
 * statement added in JDK 1.4, to indicate that an assertion failed. There
 * are enough constructors to ensure that
 * <code>new AssertionError(<em>expression</em>)</code> will work for all
 * espressions, regardless of type, as if the error message were given by
 * the string <code>"" + <em>expression</em></code>. This extends Error,
 * because you usually do not want to inadvertently trap an assertion failure.
 *
 * @author Eric Blake <ebb9@email.byu.edu>
 * @since 1.4
 * @status updated to 1.4
 */
public class AssertionError extends Error
{
  /**
   * Compatible with JDK 1.4+.
   */
  private static final long serialVersionUID = -5013299493970297370L;

  /**
   * Construct an AssertionError with no detail message.
   */
  public AssertionError()
  {
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * object as its error message. If the object is a Throwable, it is also
   * set as the cause of this error.
   *
   * @param msg the source of the error message
   * @see Throwable#getCause()
   */
  public AssertionError(Object msg)
  {
    super("" + msg);
    if (msg instanceof Throwable)
      initCause((Throwable) msg);
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * boolean as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(boolean msg)
  {
    super(msg ? "true" : "false");
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * char as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(char msg)
  {
    super(String.valueOf(msg));
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * int as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(int msg)
  {
    super(Integer.toString(msg, 10));
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * long as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(long msg)
  {
    super(Long.toString(msg));
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * float as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(float msg)
  {
    super(Float.toString(msg));
  }

  /**
   * Construct an AssertionError with the string conversion of the given
   * double as its error message.
   *
   * @param msg the source of the error message
   */
  public AssertionError(double msg)
  {
    super(Double.toString(msg));
  }
}

--------------030503090208050005090102--