From: Tom Tromey Date: Thu, 13 Jun 2002 18:16:26 +0000 (+0000) Subject: natString.cc (init): Handle case where DONT_COPY is true and OFFSET!=0. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93f7aeea7ac79573748c5f2632059aa6b50d74e2;p=gcc.git natString.cc (init): Handle case where DONT_COPY is true and OFFSET!=0. * java/lang/natString.cc (init): Handle case where DONT_COPY is true and OFFSET!=0. * java/lang/String.java (String(char[],int,int,boolean): New constructor. * java/lang/Long.java: Imported new version from Classpath. * java/lang/Number.java: Likewise. * java/lang/Integer.java: Likewise. * java/lang/Long.java: Likewise. * java/lang/Float.java: Likewise. * java/lang/Boolean.java: Likewise. * java/lang/Double.java: Likewise. * java/lang/Void.java: Likewise. From-SVN: r54595 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 26bd707ec6c..1b97fe772d7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2002-06-13 Tom Tromey + + * java/lang/natString.cc (init): Handle case where DONT_COPY is + true and OFFSET!=0. + * java/lang/String.java (String(char[],int,int,boolean): New + constructor. + * java/lang/Long.java: Imported new version from Classpath. + * java/lang/Number.java: Likewise. + * java/lang/Integer.java: Likewise. + * java/lang/Long.java: Likewise. + * java/lang/Float.java: Likewise. + * java/lang/Boolean.java: Likewise. + * java/lang/Double.java: Likewise. + * java/lang/Void.java: Likewise. + 2002-06-12 Tom Tromey * java/io/natFilePosix.cc (getCanonicalPath): Treat "" like ".". diff --git a/libjava/java/lang/Boolean.java b/libjava/java/lang/Boolean.java index f6feaa02902..3c09a1505c1 100644 --- a/libjava/java/lang/Boolean.java +++ b/libjava/java/lang/Boolean.java @@ -1,5 +1,5 @@ /* Boolean.java -- object wrapper for boolean - Copyright (C) 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -41,148 +41,184 @@ package java.lang; import java.io.Serializable; /** - * Instances of class Boolean represent primitive + * Instances of class Boolean represent primitive * boolean values. * * @author Paul Fisher - * @since JDK1.0 - */ + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 + */ public final class Boolean implements Serializable { - static final long serialVersionUID = -3665804199014368530L; - - /** - * This field is a Boolean object representing the - * primitive value true. This instance is returned - * by the static valueOf() methods if they return - * a Boolean representing true. - */ - public static final Boolean TRUE = new Boolean(true); - - /** - * This field is a Boolean object representing the - * primitive value false. This instance is returned - * by the static valueOf() methods if they return - * a Boolean representing false. - */ - public static final Boolean FALSE = new Boolean(false); - - /** - * The primitive type boolean is represented by this - * Class object. - */ - public static final Class TYPE = VMClassLoader.getPrimitiveClass('Z'); - - /** - * The immutable value of this Boolean. - */ - private final boolean value; - - /** - * Create a Boolean object representing the value of the - * argument value. In general the use of the static - * method valueof(boolean) is more efficient since it will - * not create a new object. - * - * @param value the primitive value of this Boolean - */ - public Boolean(boolean value) { - this.value = value; - } - - /** - * Creates a Boolean object representing the primitive - * true if and only if s matches - * the string "true" ignoring case, otherwise the object will represent - * the primitive false. In general the use of the static - * method valueof(String) is more efficient since it will - * not create a new object. - * - * @param s the String representation of true - * or false - */ - public Boolean(String s) { - value = "true".equalsIgnoreCase(s); - } - - /** - * Return the primitive boolean value of this - * Boolean object. - */ - public boolean booleanValue() { - return value; - } - - /** - * Returns the Boolean TRUE if the given boolean is - * true, otherwise it will return the Boolean - * FALSE. - * - * @since 1.4 - */ - public static Boolean valueOf(boolean b) { - return b ? TRUE : FALSE; - } - - /** - * Returns the Boolean TRUE if and only if the given - * String is equal, ignoring case, to the the String "true", otherwise - * it will return the Boolean FALSE. - */ - public static Boolean valueOf(String s) { - return "true".equalsIgnoreCase(s) ? TRUE : FALSE; - } - - /** - * Returns the integer 1231 if this object represents - * the primitive true and the integer 1237 - * otherwise. - */ - public int hashCode() { - return (value) ? 1231 : 1237; - } - - /** - * If the obj is an instance of Boolean and - * has the same primitive value as this object then true - * is returned. In all other cases, including if the obj - * is null, false is returned. - * - * @param obj possibly an instance of any Class - * @return false is obj is an instance of - * Boolean and has the same primitive value as this - * object. - */ - public boolean equals(Object obj) { - return (obj instanceof Boolean && value == ((Boolean)obj).value); - } - - /** - * If the value of the system property name matches - * "true" ignoring case then the function returns true. - */ - public static boolean getBoolean(String name) { - String val = System.getProperty(name); - return ("true".equalsIgnoreCase(val)); - } - - /** - * Returns "true" if the value of the give boolean is true and - * returns "false" if the value of the given boolean is false. - * - * @since 1.4 - */ - public static String toString(boolean b) - { - return b ? "true" : "false"; - } - - /** - * Returns "true" if the value of this object is true and - * returns "false" if the value of this object is false. - */ - public String toString() - { - return (value) ? "true" : "false"; - } + /** + * Compatible with JDK 1.0.2+. + */ + private static final long serialVersionUID = -3665804199014368530L; + + /** + * This field is a Boolean object representing the + * primitive value true. This instance is returned + * by the static valueOf() methods if they return + * a Boolean representing true. + */ + public static final Boolean TRUE = new Boolean(true); + + /** + * This field is a Boolean object representing the + * primitive value false. This instance is returned + * by the static valueOf() methods if they return + * a Boolean representing false. + */ + public static final Boolean FALSE = new Boolean(false); + + /** + * The primitive type boolean is represented by this + * Class object. + * + * @since 1.1 + */ + public static final Class TYPE = VMClassLoader.getPrimitiveClass('Z'); + + /** + * The immutable value of this Boolean. + * @serial the wrapped value + */ + private final boolean value; + + /** + * Create a Boolean object representing the value of the + * argument value. In general the use of the static + * method valueof(boolean) is more efficient since it will + * not create a new object. + * + * @param value the primitive value of this Boolean + * @see #valueOf(boolean) + */ + public Boolean(boolean value) + { + this.value = value; + } + + /** + * Creates a Boolean object representing the primitive + * true if and only if s matches + * the string "true" ignoring case, otherwise the object will represent + * the primitive false. In general the use of the static + * method valueof(String) is more efficient since it will + * not create a new object. + * + * @param s the String representation of true + * or false + */ + public Boolean(String s) + { + value = "true".equalsIgnoreCase(s); + } + + /** + * Return the primitive boolean value of this + * Boolean object. + * + * @return true or false, depending on the value of this Boolean + */ + public boolean booleanValue() + { + return value; + } + + /** + * Returns the Boolean TRUE if the given boolean is + * true, otherwise it will return the Boolean + * FALSE. + * + * @param b the boolean to wrap + * @return the wrapper object + * @see #TRUE + * @see #FALSE + * @since 1.4 + */ + public static Boolean valueOf(boolean b) + { + return b ? TRUE : FALSE; + } + + /** + * Returns the Boolean TRUE if and only if the given + * String is equal, ignoring case, to the the String "true", otherwise + * it will return the Boolean FALSE. + * + * @param s the string to convert + * @return a wrapped boolean from the string + */ + public static Boolean valueOf(String s) + { + return "true".equalsIgnoreCase(s) ? TRUE : FALSE; + } + + /** + * Returns "true" if the value of the give boolean is true and + * returns "false" if the value of the given boolean is false. + * + * @param b the boolean to convert + * @return the string representation of the boolean + * @since 1.4 + */ + public static String toString(boolean b) + { + return b ? "true" : "false"; + } + + /** + * Returns "true" if the value of this object is true and + * returns "false" if the value of this object is false. + * + * @return the string representation of this + */ + public String toString() + { + return value ? "true" : "false"; + } + + /** + * Returns the integer 1231 if this object represents + * the primitive true and the integer 1237 + * otherwise. + * + * @return the hash code + */ + public int hashCode() + { + return value ? 1231 : 1237; + } + + /** + * If the obj is an instance of Boolean and + * has the same primitive value as this object then true + * is returned. In all other cases, including if the obj + * is null, false is returned. + * + * @param obj possibly an instance of any Class + * @return true if obj equals this + */ + public boolean equals(Object obj) + { + return obj instanceof Boolean && value == ((Boolean) obj).value; + } + + /** + * If the value of the system property name matches + * "true" ignoring case then the function returns true. + * + * @param name the property name to look up + * @return true if the property resulted in "true" + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + */ + public static boolean getBoolean(String name) + { + if (name == null || "".equals(name)) + return false; + return "true".equalsIgnoreCase(System.getProperty(name)); + } } diff --git a/libjava/java/lang/Double.java b/libjava/java/lang/Double.java index c98d987a987..22f2b5f524a 100644 --- a/libjava/java/lang/Double.java +++ b/libjava/java/lang/Double.java @@ -1,4 +1,4 @@ -/* Double.java -- object wrapper for double primitive +/* Double.java -- object wrapper for double Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -40,12 +40,6 @@ package java.lang; import gnu.classpath.Configuration; -/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 - * "The Java Language Specification", ISBN 0-201-63451-1 - * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. - * Status: Believed complete and correct. - */ - /** * Instances of class Double represent primitive * double values. @@ -55,15 +49,16 @@ import gnu.classpath.Configuration; * * @author Paul Fisher * @author Andrew Haley - * @since JDK 1.0 + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 */ public final class Double extends Number implements Comparable { /** - * The minimum positive value a double may represent - * is 5e-324. + * Compatible with JDK 1.0+. */ - public static final double MIN_VALUE = 5e-324; + private static final long serialVersionUID = -9172774392245257468L; /** * The maximum positive value a double may represent @@ -71,44 +66,51 @@ public final class Double extends Number implements Comparable */ public static final double MAX_VALUE = 1.7976931348623157e+308; + /** + * The minimum positive value a double may represent + * is 5e-324. + */ + public static final double MIN_VALUE = 5e-324; + /** * The value of a double representation -1.0/0.0, negative - * infinity. + * infinity. */ - public static final double NEGATIVE_INFINITY = -1.0d/0.0d; + public static final double NEGATIVE_INFINITY = -1.0 / 0.0; /** * The value of a double representing 1.0/0.0, positive infinity. */ - public static final double POSITIVE_INFINITY = 1.0d/0.0d; + public static final double POSITIVE_INFINITY = 1.0 / 0.0; /** * All IEEE 754 values of NaN have the same value in Java. */ - public static final double NaN = 0.0d/0.0d; + public static final double NaN = 0.0 / 0.0; /** * The primitive type double is represented by this * Class object. + * @since 1.1 */ public static final Class TYPE = VMClassLoader.getPrimitiveClass('D'); /** * The immutable value of this Double. + * + * @serial the wrapped double */ private final double value; - private static final long serialVersionUID = -9172774392245257468L; - /** - * Load native routines necessary for this class. + * Load native routines necessary for this class. */ static { if (Configuration.INIT_LOAD_LIBRARY) { - System.loadLibrary ("javalang"); - initIDs (); + System.loadLibrary("javalang"); + initIDs(); } } @@ -118,411 +120,421 @@ public final class Double extends Number implements Comparable * * @param value the double argument */ - public Double (double value) + public Double(double value) { this.value = value; } /** - * Create a Double from the specified - * String. - * + * Create a Double from the specified String. * This method calls Double.parseDouble(). * - * @exception NumberFormatException when the String cannot - * be parsed into a Float. * @param s the String to convert - * @see #parseDouble(java.lang.String) + * @throws NumberFormatException if s cannot be parsed as a + * double + * @throws NullPointerException if s is null + * @see #parseDouble(String) */ - public Double (String s) throws NumberFormatException + public Double(String s) { - value = parseDouble (s); + value = parseDouble(s); } /** - * Convert the double value of this Double - * to a String. This method calls - * Double.toString(double) to do its dirty work. + * Convert the double to a String. + * Floating-point string representation is fairly complex: here is a + * rundown of the possible values. "[-]" indicates that a + * negative sign will be printed if the value (or exponent) is negative. + * "<number>" means a string of digits ('0' to '9'). + * "<digit>" means a single digit ('0' to '9').
* - * @return the String representation of this Double. - * @see #toString(double) + * + * + * + * + * + * + * + * + * + *
Value of DoubleString Representation
[+-] 0 [-]0.0
Between [+-] 10-3 and 107, exclusive[-]number.number
Other numeric value[-]<digit>.<number> + * E[-]<number>
[+-] infinity [-]Infinity
NaN NaN
+ * + * Yes, negative zero is a possible value. Note that there is + * always a . and at least one digit printed after + * it: even if the number is 3, it will be printed as 3.0. + * After the ".", all digits will be printed except trailing zeros. The + * result is rounded to the shortest decimal number which will parse back + * to the same double. + * + *

To create other output formats, use {@link java.text.NumberFormat}. + * + * @XXX specify where we are not in accord with the spec. + * + * @param d the double to convert + * @return the String representing the double */ - public String toString () + public static String toString(double d) { - return toString (value); + return toString(d, false); } /** - * If the Object is not null, is an - * instanceof Double, and represents - * the same primitive double value return - * true. Otherwise false is returned. - *

- * Note that there are two differences between == and - * equals(). 0.0d == -0.0d returns true - * but new Double(0.0d).equals(new Double(-0.0d)) returns - * false. And Double.NaN == Double.NaN returns - * false, but - * new Double(Double.NaN).equals(new Double(Double.NaN)) returns - * true. + * Create a new Double object using the String. * - * @param obj the object to compare to - * @return whether the objects are semantically equal. + * @param s the String to convert + * @return the new Double + * @throws NumberFormatException if s cannot be parsed as a + * double + * @throws NullPointerException if s is null. + * @see #parseDouble(String) */ - public boolean equals (Object obj) + public static Double valueOf(String s) { - if (!(obj instanceof Double)) - return false; - - double d = ((Double) obj).value; - - // GCJ LOCAL: this implementation is probably faster than - // Classpath's, especially once we inline doubleToLongBits. - return doubleToLongBits (value) == doubleToLongBits (d); - // END GCJ LOCAL + // XXX just call new Double(parseDouble(s)); + if (s == null) + throw new NullPointerException(); + return new Double(s); } /** - * The hashcode is the value of the expression:
- *
- * (int)(v^(v>>>32))
- *
- * where v is defined by:
- * long v = Double.doubleToLongBits(this.longValue());
+ * Parse the specified String as a double. The + * extended BNF grammar is as follows:
+ * 

+   * DecodableString:
+   *      ( [ - | + ] NaN )
+   *    | ( [ - | + ] Infinity )
+   *    | ( [ - | + ] FloatingPoint
+   *              [ f | F | d
+   *                | D] )
+   * FloatingPoint:
+   *      ( { Digit }+ [ . { Digit } ]
+   *              [ Exponent ] )
+   *    | ( . { Digit }+ [ Exponent ] )
+   * Exponent:
+   *      ( ( e | E )
+   *              [ - | + ] { Digit }+ )
+   * Digit: '0' through '9'
+   *
+ * + *

NaN and infinity are special cases, to allow parsing of the output + * of toString. Otherwise, the result is determined by calculating + * n * 10exponent to infinite precision, then rounding + * to the nearest double. Remember that many numbers cannot be precisely + * represented in floating point. In case of overflow, infinity is used, + * and in case of underflow, signed zero is used. Unlike Integer.parseInt, + * this does not accept Unicode digits outside the ASCII range. + * + *

If an unexpected character is found in the String, a + * NumberFormatException will be thrown. Leading and trailing + * 'whitespace' is ignored via String.trim(), but spaces + * internal to the actual number are not allowed. + * + *

To parse numbers according to another format, consider using + * {@link java.text.NumberFormat}. + * + * @XXX specify where/how we are not in accord with the spec. + * + * @param str the String to convert + * @return the double value of s + * @throws NumberFormatException if s cannot be parsed as a + * double + * @throws NullPointerException if s is null + * @see #MIN_VALUE + * @see #MAX_VALUE + * @see #POSITIVE_INFINITY + * @see #NEGATIVE_INFINITY + * @since 1.2 */ - public int hashCode () - { - long v = doubleToLongBits (value); - return (int) (v ^ (v >>> 32)); - } + public static native double parseDouble(String s); /** - * Return the value of this Double when cast to an - * int. + * Return true if the double has the same + * value as NaN, otherwise return false. + * + * @param v the double to compare + * @return whether the argument is NaN. */ - public int intValue () + public static boolean isNaN(double v) { - return (int) value; + // This works since NaN != NaN is the only reflexive inequality + // comparison which returns true. + return v != v; } /** - * Return the value of this Double when cast to a - * long. + * Return true if the double has a value + * equal to either NEGATIVE_INFINITY or + * POSITIVE_INFINITY, otherwise return false. + * + * @param v the double to compare + * @return whether the argument is (-/+) infinity. */ - public long longValue () + public static boolean isInfinite(double v) { - return (long) value; + return v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY; } /** - * Return the value of this Double when cast to a - * float. + * Return true if the value of this Double + * is the same as NaN, otherwise return false. + * + * @return whether this Double is NaN */ - public float floatValue () + public boolean isNaN() { - return (float) value; + return isNaN(value); } /** - * Return the primitive double value represented by this - * Double. + * Return true if the value of this Double + * is the same as NEGATIVE_INFINITY or + * POSITIVE_INFINITY, otherwise return false. + * + * @return whether this Double is (-/+) infinity */ - public double doubleValue () + public boolean isInfinite() { - return value; + return isInfinite(value); } /** - * Return the result of calling new Double(java.lang.String). - * - * @param s the String to convert to a Double. - * @return a new Double representing the String's - * numeric value. + * Convert the double value of this Double + * to a String. This method calls + * Double.toString(double) to do its dirty work. * - * @exception NullPointerException thrown if String is - * null. - * @exception NumberFormatException thrown if String cannot - * be parsed as a double. - * @see #Double(java.lang.String) - * @see #parseDouble(java.lang.String) + * @return the String representation + * @see #toString(double) */ - public static Double valueOf (String s) throws NumberFormatException + public String toString() { - return new Double (s); + return toString(value); } /** - * Return true if the value of this Double - * is the same as NaN, otherwise return false. - * @return whether this Double is NaN. + * Return the value of this Double as a byte. + * + * @return the byte value + * @since 1.1 */ - public boolean isNaN () + public byte byteValue() { - return isNaN (value); + return (byte) value; } /** - * Return true if the double has the same - * value as NaN, otherwise return false. + * Return the value of this Double as a short. * - * @param v the double to compare - * @return whether the argument is NaN. + * @return the short value + * @since 1.1 */ - public static boolean isNaN (double v) + public short shortValue() { - // This works since NaN != NaN is the only reflexive inequality - // comparison which returns true. - return v != v; + return (short) value; } /** - * Return true if the value of this Double - * is the same as NEGATIVE_INFINITY or - * POSITIVE_INFINITY, otherwise return false. + * Return the value of this Double as an int. * - * @return whether this Double is (-/+) infinity. + * @return the int value */ - public boolean isInfinite () + public int intValue() { - return isInfinite (value); + return (int) value; } /** - * Return true if the double has a value - * equal to either NEGATIVE_INFINITY or - * POSITIVE_INFINITY, otherwise return false. + * Return the value of this Double as a long. * - * @param v the double to compare - * @return whether the argument is (-/+) infinity. + * @return the long value */ - public static boolean isInfinite (double v) + public long longValue() { - return (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY); + return (long) value; } /** - * Returns 0 if the double value of the argument is - * equal to the value of this Double. Returns a number - * less than zero if the value of this Double is less - * than the double value of the argument, and returns a - * number greater than zero if the value of this Double - * is greater than the double value of the argument. - *
- * Double.NaN is greater than any number other than itself, - * even Double.POSITIVE_INFINITY. - *
- * 0.0d is greater than -0.0d. - * - * @param d the Double to compare to. - * @return 0 if the Doubles are the same, < 0 if this - * Double is less than the Double in - * in question, or > 0 if it is greater. - * @since 1.2 + * Return the value of this Double as a float. + * + * @return the float value */ - public int compareTo (Double d) + public float floatValue() { - return compare (value, d.value); + return (float) value; } /** - * Returns 0 if the first argument is equal to the second argument. - * Returns a number less than zero if the first argument is less than the - * second argument, and returns a number greater than zero if the first - * argument is greater than the second argument. - *
- * Double.NaN is greater than any number other than itself, - * even Double.POSITIVE_INFINITY. - *
- * 0.0d is greater than -0.0d. - * - * @param x the first double to compare. - * @param y the second double to compare. - * @return 0 if the arguments are the same, < 0 if the - * first argument is less than the second argument in - * in question, or > 0 if it is greater. - * @since 1.4 + * Return the value of this Double. + * + * @return the double value */ - public static int compare (double x, double y) + public double doubleValue() { - if (isNaN (x)) - return isNaN (y) ? 0 : 1; - if (isNaN (y)) - return -1; - // recall that 0.0 == -0.0, so we convert to infinites and try again - if (x == 0 && y == 0) - return (int) (1 / x - 1 / y); - if (x == y) - return 0; - - return x > y ? 1 : -1; + return value; } /** - * Compares the specified Object to this Double - * if and only if the Object is an instanceof - * Double. + * Return a hashcode representing this Object. Double's hash + * code is calculated by:
+ * long v = Double.doubleToLongBits(doubleValue());
+ * int hash = (int)(v^(v>>32)). * - * @param o the Object to compare to. - * @return 0 if the Doubles are the same, < 0 if this - * Double is less than the Double in - * in question, or > 0 if it is greater. - * @throws ClassCastException if the argument is not a Double + * @return this Object's hash code + * @see #doubleToLongBits(double) */ - public int compareTo (Object o) + public int hashCode() { - return compareTo ((Double) o); + long v = doubleToLongBits(value); + return (int) (v ^ (v >>> 32)); } /** - * Convert the double to a String. - *

- * - * Floating-point string representation is fairly complex: here is a - * rundown of the possible values. "[-]" indicates that a - * negative sign will be printed if the value (or exponent) is negative. - * "<number>" means a string of digits (0-9). - * "<digit>" means a single digit (0-9). - *

- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Value of FloatString Representation
[+-] 0[-]0.0
Between [+-] 10-3 and 107[-]number.number
Other numeric value[-]<digit>.<number>E[-]<number>
[+-] infinity[-]Infinity
NaNNaN
- * - * Yes, negative zero is a possible value. Note that there is - * always a . and at least one digit printed after - * it: even if the number is 3, it will be printed as 3.0. - * After the ".", all digits will be printed except trailing zeros. No - * truncation or rounding is done by this function. - * + * Returns true if obj is an instance of + * Double and represents the same double value. Unlike comparing + * two doubles with ==, this treats two instances of + * Double.NaN as equal, but treats 0.0 and + * -0.0 as unequal. * - * @XXX specify where we are not in accord with the spec. + *

Note that d1.equals(d2) is identical to + * doubleToLongBits(d1.doubleValue()) == + * doubleToLongBits(d2.doubleValue()). * - * @param d the double to convert - * @return the String representing the double. + * @param obj the object to compare + * @return whether the objects are semantically equal */ - public static String toString (double d) + public boolean equals(Object obj) { - return toString (d, false); - } + if (! (obj instanceof Double)) + return false; - static native String toString (double d, boolean isFloat); + double d = ((Double) obj).value; + + // Avoid call to native method. However, some implementations, like gcj, + // are better off using floatToIntBits(value) == floatToIntBits(f). + // Check common case first, then check NaN and 0. + if (value == d) + return (value != 0) || (1 / value == 1 / d); + return isNaN(value) && isNaN(d); + } /** - * Return the long bits of the specified double. - * The result of this function can be used as the argument to - * Double.longBitsToDouble(long) to obtain the - * original double value. + * Convert the double to the IEEE 754 floating-point "double format" bit + * layout. Bit 63 (the most significant) is the sign bit, bits 62-52 + * (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0 + * (masked by 0x000fffffffffffffL) are the mantissa. This function + * collapses all versions of NaN to 0x7ff8000000000000L. The result of this + * function can be used as the argument to + * Double.longBitsToDouble(long) to obtain the original + * double value. * * @param value the double to convert - * @return the bits of the double. + * @return the bits of the double + * @see #longBitsToDouble(long) */ - public static native long doubleToLongBits (double value); + public static native long doubleToLongBits(double value); /** - * Return the long bits of the specified double. - * The result of this function can be used as the argument to - * Double.longBitsToDouble(long) to obtain the - * original double value. This method differs from - * doubleToLongBits in that it does not collapse - * NaN values. + * Convert the double to the IEEE 754 floating-point "double format" bit + * layout. Bit 63 (the most significant) is the sign bit, bits 62-52 + * (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0 + * (masked by 0x000fffffffffffffL) are the mantissa. This function + * leaves NaN alone, rather than collapsing to a canonical value. The + * result of this function can be used as the argument to + * Double.longBitsToDouble(long) to obtain the original + * double value. * * @param value the double to convert - * @return the bits of the double. - */ - public static native long doubleToRawLongBits (double value); - - /** - * Return the double represented by the long - * bits specified. - * - * @param bits the long bits representing a double - * @return the double represented by the bits. - */ - public static native double longBitsToDouble (long bits); - - /** - * Parse the specified String as a double. - * - * The number is really read as n * 10exponent. The - * first number is n, and if there is an "E" - * ("e" is also acceptable), then the integer after that is - * the exponent. - *

- * Here are the possible forms the number can take: - *
- * - * - * - * - * - * - *
FormExamples
[+-]<number>[.]345., -10, 12
[+-]<number>.<number>40.2, 80.00, -12.30
[+-]<number>[.]E[+-]<number>80E12, -12e+7, 4.E-123
[+-]<number>.<number>E[+-]<number>6.02e-22, -40.2E+6, 12.3e9
- * - * "[+-]" means either a plus or minus sign may go there, or - * neither, in which case + is assumed. - *
- * "[.]" means a dot may be placed here, but is optional. - *
- * "<number>" means a string of digits (0-9), basically - * an integer. "<number>.<number>" is basically - * a real number, a floating-point value. - *

- * - * Remember that a double has a limited range. If the - * number you specify is greater than Double.MAX_VALUE or less - * than -Double.MAX_VALUE, it will be set at - * Double.POSITIVE_INFINITY or - * Double.NEGATIVE_INFINITY, respectively. - *

- * Note also that double does not have perfect precision. Many - * numbers cannot be precisely represented. The number you specify - * will be rounded to the nearest representable value. - * Double.MIN_VALUE is the margin of error for - * double values. - *

- * If an unexpected character is found in the String, a - * NumberFormatException will be thrown. Spaces are not - * allowed, and will cause the same exception. + * @return the bits of the double + * @see #longBitsToDouble(long) + */ + public static native long doubleToRawLongBits(double value); + + /** + * Convert the argument in IEEE 754 floating-point "double format" bit + * layout to the corresponding float. Bit 63 (the most significant) is the + * sign bit, bits 62-52 (masked by 0x7ff0000000000000L) represent the + * exponent, and bits 51-0 (masked by 0x000fffffffffffffL) are the mantissa. + * This function leaves NaN alone, so that you can recover the bit pattern + * with Double.doubleToRawLongBits(double). * - * @XXX specify where/how we are not in accord with the spec. + * @param bits the bits to convert + * @return the double represented by the bits + * @see #doubleToLongBits(double) + * @see #doubleToRawLongBits(double) + */ + public static native double longBitsToDouble(long bits); + + /** + * Compare two Doubles numerically by comparing their double + * values. The result is positive if the first is greater, negative if the + * second is greater, and 0 if the two are equal. However, this special + * cases NaN and signed zero as follows: NaN is considered greater than + * all other doubles, including POSITIVE_INFINITY, and positive + * zero is considered greater than negative zero. * - * @param str the String to convert - * @return the value of the String as a double. - * @exception NumberFormatException when the string cannot be parsed to a - * double. - * @exception NullPointerException when the string is null. - * @see #MIN_VALUE - * @see #MAX_VALUE - * @see #POSITIVE_INFINITY - * @see #NEGATIVE_INFINITY + * @param d the Double to compare + * @return the comparison + * @since 1.2 + */ + public int compareTo(Double d) + { + return compare(value, d.value); + } + + /** + * Behaves like compareTo(Double) unless the Object + * is not an Double. + * + * @param o the object to compare + * @return the comparison + * @throws ClassCastException if the argument is not a Double + * @see #compareTo(Double) + * @see Comparable * @since 1.2 */ - public static native double parseDouble (String s) - throws NumberFormatException; + public int compareTo(Object o) + { + return compare(value, ((Double) o).value); + } + + /** + * Behaves like new Double(x).compareTo(new Double(y)); in + * other words this compares two doubles, special casing NaN and zero, + * without the overhead of objects. + * + * @param x the first double to compare + * @param y the second double to compare + * @return the comparison + * @since 1.4 + */ + public static int compare(double x, double y) + { + if (isNaN(x)) + return isNaN(y) ? 0 : 1; + if (isNaN(y)) + return -1; + // recall that 0.0 == -0.0, so we convert to infinites and try again + if (x == 0 && y == 0) + return (int) (1 / x - 1 / y); + if (x == y) + return 0; + + return x > y ? 1 : -1; + } + + /** + * Helper method to convert to string. + * + * @param d the double to convert + * @param isFloat true if the conversion is requested by Float (results in + * fewer digits) + */ + // Package visible for use by Float. + static native String toString(double d, boolean isFloat); /** - * Initialize JNI cache. This method is called only by the + * Initialize JNI cache. This method is called only by the * static initializer when using JNI. */ - private static native void initIDs (); + private static native void initIDs(); } diff --git a/libjava/java/lang/Float.java b/libjava/java/lang/Float.java index 7c0d19914e2..930b8415076 100644 --- a/libjava/java/lang/Float.java +++ b/libjava/java/lang/Float.java @@ -1,4 +1,4 @@ -/* java.lang.Float +/* Float.java -- object wrapper for float Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -40,12 +40,6 @@ package java.lang; import gnu.classpath.Configuration; -/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 - * "The Java Language Specification", ISBN 0-201-63451-1 - * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. - * Status: Believed complete and correct. - */ - /** * Instances of class Float represent primitive * float values. @@ -55,10 +49,17 @@ import gnu.classpath.Configuration; * * @author Paul Fisher * @author Andrew Haley - * @since JDK 1.0 + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 */ public final class Float extends Number implements Comparable { + /** + * Compatible with JDK 1.0+. + */ + private static final long serialVersionUID = -2671257302660747028L; + /** * The maximum positive value a double may represent * is 3.4028235e+38f. @@ -74,46 +75,50 @@ public final class Float extends Number implements Comparable /** * The value of a float representation -1.0/0.0, negative infinity. */ - public static final float NEGATIVE_INFINITY = -1.0f/0.0f; + public static final float NEGATIVE_INFINITY = -1.0f / 0.0f; /** * The value of a float representation 1.0/0.0, positive infinity. */ - public static final float POSITIVE_INFINITY = 1.0f/0.0f; + public static final float POSITIVE_INFINITY = 1.0f / 0.0f; /** * All IEEE 754 values of NaN have the same value in Java. */ - public static final float NaN = 0.0f/0.0f; + public static final float NaN = 0.0f / 0.0f; /** - * The primitive type float is represented by this + * The primitive type float is represented by this * Class object. + * @since 1.1 */ public static final Class TYPE = VMClassLoader.getPrimitiveClass('F'); /** * The immutable value of this Float. + * + * @serial the wrapped float */ private final float value; - private static final long serialVersionUID = -2671257302660747028L; - + /** + * Load native routines necessary for this class. + */ static { if (Configuration.INIT_LOAD_LIBRARY) { - System.loadLibrary ("javalang"); + System.loadLibrary("javalang"); } } /** - * Create a float from the primitive Float + * Create a Float from the primitive float * specified. * - * @param value the Float argument + * @param value the float argument */ - public Float (float value) + public Float(float value) { this.value = value; } @@ -124,379 +129,395 @@ public final class Float extends Number implements Comparable * * @param value the double argument */ - public Float (double value) + public Float(double value) { - this.value = (float)value; + this.value = (float) value; } /** * Create a Float from the specified String. - * * This method calls Float.parseFloat(). * - * @exception NumberFormatException when the String cannot - * be parsed into a Float. * @param s the String to convert - * @see #parseFloat(java.lang.String) + * @throws NumberFormatException if s cannot be parsed as a + * float + * @throws NullPointerException if s is null + * @see #parseFloat(String) + */ + public Float(String s) + { + value = parseFloat(s); + } + + /** + * Convert the float to a String. + * Floating-point string representation is fairly complex: here is a + * rundown of the possible values. "[-]" indicates that a + * negative sign will be printed if the value (or exponent) is negative. + * "<number>" means a string of digits ('0' to '9'). + * "<digit>" means a single digit ('0' to '9').
+ * + * + * + * + * + * + * + * + * + * + *
Value of FloatString Representation
[+-] 0 [-]0.0
Between [+-] 10-3 and 107, exclusive[-]number.number
Other numeric value[-]<digit>.<number> + * E[-]<number>
[+-] infinity [-]Infinity
NaN NaN
+ * + * Yes, negative zero is a possible value. Note that there is + * always a . and at least one digit printed after + * it: even if the number is 3, it will be printed as 3.0. + * After the ".", all digits will be printed except trailing zeros. The + * result is rounded to the shortest decimal number which will parse back + * to the same float. + * + *

To create other output formats, use {@link java.text.NumberFormat}. + * + * @XXX specify where we are not in accord with the spec. + * + * @param f the float to convert + * @return the String representing the float + */ + public static String toString(float f) + { + return Double.toString(f, true); + } + + /** + * Creates a new Float object using the String. + * + * @param s the String to convert + * @return the new Float + * @throws NumberFormatException if s cannot be parsed as a + * float + * @throws NullPointerException if s is null + * @see #parseFloat(String) */ - public Float (String s) throws NumberFormatException + public static Float valueOf(String s) { - this.value = parseFloat (s); + return new Float(parseFloat(s)); } /** - * Parse the specified String as a float. - * - * The number is really read as n * 10exponent. The - * first number is n, and if there is an "E" - * ("e" is also acceptable), then the integer after that is - * the exponent. - *

- * Here are the possible forms the number can take: - *
- * - * - * - * - * - * - *
FormExamples
[+-]<number>[.]345., -10, 12
[+-]<number>.<number>40.2, 80.00, -12.30
[+-]<number>[.]E[+-]<number>80E12, -12e+7, 4.E-123
[+-]<number>.<number>E[+-]<number>6.02e-22, -40.2E+6, 12.3e9
- * - * "[+-]" means either a plus or minus sign may go there, or - * neither, in which case + is assumed. - *
- * "[.]" means a dot may be placed here, but is optional. - *
- * "<number>" means a string of digits (0-9), basically - * an integer. "<number>.<number>" is basically - * a real number, a floating-point value. - *

- * Remember that a float has a limited range. If the - * number you specify is greater than Float.MAX_VALUE or less - * than -Float.MAX_VALUE, it will be set at - * Float.POSITIVE_INFINITY or - * Float.NEGATIVE_INFINITY, respectively. - *

- * - * Note also that float does not have perfect precision. Many - * numbers cannot be precisely represented. The number you specify - * will be rounded to the nearest representable value. - * Float.MIN_VALUE is the margin of error for float - * values. - *

- * If an unexpected character is found in the String, a - * NumberFormatException will be thrown. Spaces are not - * allowed and will cause this exception to be thrown. + * Parse the specified String as a float. The + * extended BNF grammar is as follows:
+ * 

+   * DecodableString:
+   *      ( [ - | + ] NaN )
+   *    | ( [ - | + ] Infinity )
+   *    | ( [ - | + ] FloatingPoint
+   *              [ f | F | d
+   *                | D] )
+   * FloatingPoint:
+   *      ( { Digit }+ [ . { Digit } ]
+   *              [ Exponent ] )
+   *    | ( . { Digit }+ [ Exponent ] )
+   * Exponent:
+   *      ( ( e | E )
+   *              [ - | + ] { Digit }+ )
+   * Digit: '0' through '9'
+   *
+ * + *

NaN and infinity are special cases, to allow parsing of the output + * of toString. Otherwise, the result is determined by calculating + * n * 10exponent to infinite precision, then rounding + * to the nearest float. Remember that many numbers cannot be precisely + * represented in floating point. In case of overflow, infinity is used, + * and in case of underflow, signed zero is used. Unlike Integer.parseInt, + * this does not accept Unicode digits outside the ASCII range. + * + *

If an unexpected character is found in the String, a + * NumberFormatException will be thrown. Leading and trailing + * 'whitespace' is ignored via String.trim(), but spaces + * internal to the actual number are not allowed. + * + *

To parse numbers according to another format, consider using + * {@link java.text.NumberFormat}. * * @XXX specify where/how we are not in accord with the spec. * * @param str the String to convert - * @return the value of the String as a float. - * @exception NumberFormatException when the string cannot be parsed to a - * float. - * @since JDK 1.2 + * @return the float value of s + * @throws NumberFormatException if s cannot be parsed as a + * float + * @throws NullPointerException if s is null * @see #MIN_VALUE * @see #MAX_VALUE * @see #POSITIVE_INFINITY * @see #NEGATIVE_INFINITY + * @since 1.2 */ - public static float parseFloat (String s) throws NumberFormatException + public static float parseFloat(String s) { - // The spec says that parseFloat() should work like - // Double.valueOf(). This is equivalent, in our implementation, - // but more efficient. - return (float) Double.parseDouble (s); + // XXX Rounding parseDouble() causes some errors greater than 1 ulp from + // the infinitely precise decimal. + return (float) Double.parseDouble(s); } /** - * Convert the float value of this Float - * to a String. This method calls - * Float.toString(float) to do its dirty work. + * Return true if the float has the same + * value as NaN, otherwise return false. * - * @return the String representation of this Float. - * @see #toString(float) + * @param v the float to compare + * @return whether the argument is NaN */ - public String toString () + public static boolean isNaN(float v) { - return toString (value); + // This works since NaN != NaN is the only reflexive inequality + // comparison which returns true. + return v != v; } /** - * If the Object is not null, is an - * instanceof Float, and represents - * the same primitive float value return - * true. Otherwise false is returned. - *

- * Note that there are two differences between == and - * equals(). 0.0f == -0.0f returns true - * but new Float(0.0f).equals(new Float(-0.0f)) returns - * false. And Float.NaN == Float.NaN returns - * false, but - * new Float(Float.NaN).equals(new Float(Float.NaN)) returns - * true. + * Return true if the float has a value + * equal to either NEGATIVE_INFINITY or + * POSITIVE_INFINITY, otherwise return false. * - * @param obj the object to compare to - * @return whether the objects are semantically equal. + * @param v the float to compare + * @return whether the argument is (-/+) infinity */ - public boolean equals (Object obj) + public static boolean isInfinite(float v) { - if (!(obj instanceof Float)) - return false; - - float f = ((Float) obj).value; - - // GCJ LOCAL: this implementation is probably faster than - // Classpath's, especially once we inline floatToIntBits. - return floatToIntBits (value) == floatToIntBits (f); - // END GCJ LOCAL + return v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY; } /** - * Return a hashcode representing this Object. - * Float's hash code is calculated by calling the - * floatToIntBits() function. - * @return this Object's hash code. - * @see java.lang.Float.floatToIntBits(float) + * Return true if the value of this Float + * is the same as NaN, otherwise return false. + * + * @return whether this Float is NaN */ - public int hashCode () + public boolean isNaN() { - return floatToIntBits (value); + return isNaN(value); } /** - * Return the value of this Double when cast to an - * int. + * Return true if the value of this Float + * is the same as NEGATIVE_INFINITY or + * POSITIVE_INFINITY, otherwise return false. + * + * @return whether this Float is (-/+) infinity */ - public int intValue () + public boolean isInfinite() { - return (int) value; + return isInfinite(value); } /** - * Return the value of this Double when cast to a - * long. + * Convert the float value of this Float + * to a String. This method calls + * Float.toString(float) to do its dirty work. + * + * @return the String representation + * @see #toString(float) */ - public long longValue () + public String toString() { - return (long) value; + return toString(value); } /** - * Return the value of this Double when cast to a - * float. + * Return the value of this Float as a byte. + * + * @return the byte value + * @since 1.1 */ - public float floatValue () + public byte byteValue() { - return (float) value; + return (byte) value; } /** - * Return the primitive double value represented by this - * Double. + * Return the value of this Float as a short. + * + * @return the short value + * @since 1.1 */ - public double doubleValue () + public short shortValue() { - return (double) value; + return (short) value; } /** - * Convert the float to a String. - *

+ * Return the value of this Integer as an int. * - * Floating-point string representation is fairly complex: here is a - * rundown of the possible values. "[-]" indicates that a - * negative sign will be printed if the value (or exponent) is negative. - * "<number>" means a string of digits (0-9). - * "<digit>" means a single digit (0-9). - *

- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Value of FloatString Representation
[+-] 0[-]0.0
Between [+-] 10-3 and 107[-]number.number
Other numeric value[-]<digit>.<number>E[-]<number>
[+-] infinity[-]Infinity
NaNNaN
- * - * Yes, negative zero is a possible value. Note that there is - * always a . and at least one digit printed after - * it: even if the number is 3, it will be printed as 3.0. - * After the ".", all digits will be printed except trailing zeros. No - * truncation or rounding is done by this function. - * - * @XXX specify where we are not in accord with the spec. - * - * @param f the float to convert - * @return the String representing the float. + * @return the int value */ - public static String toString (float f) + public int intValue() { - return Double.toString ((double) f, true); + return (int) value; } /** - * Return the result of calling new Float(java.lang.String). - * - * @param s the String to convert to a Float. - * @return a new Float representing the String's - * numeric value. + * Return the value of this Integer as a long. * - * @exception NumberFormatException thrown if String cannot - * be parsed as a double. - * @see #Float(java.lang.String) - * @see #parseFloat(java.lang.String) + * @return the long value */ - public static Float valueOf (String s) throws NumberFormatException + public long longValue() { - return new Float (s); + return (long) value; } /** - * Return true if the value of this Float - * is the same as NaN, otherwise return false. - * @return whether this Float is NaN. + * Return the value of this Float. + * + * @return the float value */ - public boolean isNaN () + public float floatValue() { - return isNaN (value); + return value; } /** - * Return true if the float has the same - * value as NaN, otherwise return false. + * Return the value of this Float as a double * - * @param v the float to compare - * @return whether the argument is NaN. + * @return the double value */ - public static boolean isNaN (float v) + public double doubleValue() { - // This works since NaN != NaN is the only reflexive inequality - // comparison which returns true. - return v != v; + return value; } /** - * Return true if the value of this Float - * is the same as NEGATIVE_INFINITY or - * POSITIVE_INFINITY, otherwise return false. + * Return a hashcode representing this Object. Float's hash + * code is calculated by calling floatToIntBits(floatValue()). * - * @return whether this Float is (-/+) infinity. + * @return this Object's hash code + * @see #floatToIntBits(float) */ - public boolean isInfinite () + public int hashCode() { - return isInfinite (value); + return floatToIntBits(value); } /** - * Return true if the float has a value - * equal to either NEGATIVE_INFINITY or - * POSITIVE_INFINITY, otherwise return false. + * Returns true if obj is an instance of + * Float and represents the same float value. Unlike comparing + * two floats with ==, this treats two instances of + * Float.NaN as equal, but treats 0.0 and + * -0.0 as unequal. * - * @param v the float to compare - * @return whether the argument is (-/+) infinity. + *

Note that f1.equals(f2) is identical to + * floatToIntBits(f1.floatValue()) == + * floatToIntBits(f2.floatValue()). + * + * @param obj the object to compare + * @return whether the objects are semantically equal */ - public static boolean isInfinite (float v) + public boolean equals(Object obj) { - return (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY); + if (! (obj instanceof Float)) + return false; + + float f = ((Float) obj).value; + + // Avoid call to native method. However, some implementations, like gcj, + // are better off using floatToIntBits(value) == floatToIntBits(f). + // Check common case first, then check NaN and 0. + if (value == f) + return (value != 0) || (1 / value == 1 / f); + return isNaN(value) && isNaN(f); } /** - * Return the int bits of the specified float. - * The result of this function can be used as the argument to - * Float.intBitsToFloat(long) to obtain the + * Convert the float to the IEEE 754 floating-point "single format" bit + * layout. Bit 31 (the most significant) is the sign bit, bits 30-23 + * (masked by 0x7f800000) represent the exponent, and bits 22-0 + * (masked by 0x007fffff) are the mantissa. This function collapses all + * versions of NaN to 0x7fc00000. The result of this function can be used + * as the argument to Float.intBitsToFloat(int) to obtain the * original float value. * * @param value the float to convert - * @return the bits of the float. + * @return the bits of the float + * @see #intBitsToFloat(int) */ - public static native int floatToIntBits (float value); + public static native int floatToIntBits(float value); /** - * Return the int bits of the specified float. - * The result of this function can be used as the argument to - * Float.intBitsToFloat(long) to obtain the - * original float value. The difference between - * this function and floatToIntBits is that this - * function does not collapse NaN values. + * Convert the float to the IEEE 754 floating-point "single format" bit + * layout. Bit 31 (the most significant) is the sign bit, bits 30-23 + * (masked by 0x7f800000) represent the exponent, and bits 22-0 + * (masked by 0x007fffff) are the mantissa. This function leaves NaN alone, + * rather than collapsing to a canonical value. The result of this function + * can be used as the argument to Float.intBitsToFloat(int) to + * obtain the original float value. * * @param value the float to convert - * @return the bits of the float. + * @return the bits of the float + * @see #intBitsToFloat(int) */ - public static native int floatToRawIntBits (float value); + public static native int floatToRawIntBits(float value); /** - * Return the float represented by the long - * bits specified. + * Convert the argument in IEEE 754 floating-point "single format" bit + * layout to the corresponding float. Bit 31 (the most significant) is the + * sign bit, bits 30-23 (masked by 0x7f800000) represent the exponent, and + * bits 22-0 (masked by 0x007fffff) are the mantissa. This function leaves + * NaN alone, so that you can recover the bit pattern with + * Float.floatToRawIntBits(float). * - * @param bits the long bits representing a double - * @return the float represented by the bits. + * @param bits the bits to convert + * @return the float represented by the bits + * @see #floatToIntBits(float) + * @see #floatToRawIntBits(float) */ - public static native float intBitsToFloat (int bits); + public static native float intBitsToFloat(int bits); /** - * Returns 0 if the float value of the argument is - * equal to the value of this Float. Returns a number - * less than zero if the value of this Float is less - * than the Float value of the argument, and returns a - * number greater than zero if the value of this Float - * is greater than the float value of the argument. - *
- * Float.NaN is greater than any number other than itself, - * even Float.POSITIVE_INFINITY. - *
- * 0.0 is greater than -0.0. + * Compare two Floats numerically by comparing their float + * values. The result is positive if the first is greater, negative if the + * second is greater, and 0 if the two are equal. However, this special + * cases NaN and signed zero as follows: NaN is considered greater than + * all other floats, including POSITIVE_INFINITY, and positive + * zero is considered greater than negative zero. * - * @param f the Float to compare to. - * @return 0 if the Floats are the same, < 0 if this - * Float is less than the Float in - * in question, or > 0 if it is greater. + * @param f the Float to compare + * @return the comparison + * @since 1.2 + */ + public int compareTo(Float f) + { + return compare(value, f.value); + } + + /** + * Behaves like compareTo(Float) unless the Object + * is not an Float. * + * @param o the object to compare + * @return the comparison + * @throws ClassCastException if the argument is not a Float + * @see #compareTo(Float) + * @see Comparable * @since 1.2 */ - public int compareTo (Float f) + public int compareTo(Object o) { - return compare (value, f.value); + return compare(value, ((Float) o).value); } /** - * Returns 0 if the first argument is equal to the second argument. - * Returns a number less than zero if the first argument is less than the - * second argument, and returns a number greater than zero if the first - * argument is greater than the second argument. - *
- * Float.NaN is greater than any number other than itself, - * even Float.POSITIVE_INFINITY. - *
- * 0.0 is greater than -0.0. - * - * @param x the first float to compare. - * @param y the second float to compare. - * @return 0 if the arguments are the same, < 0 if the - * first argument is less than the second argument in - * in question, or > 0 if it is greater. + * Behaves like new Float(x).compareTo(new Float(y)); in + * other words this compares two floats, special casing NaN and zero, + * without the overhead of objects. + * + * @param x the first float to compare + * @param y the second float to compare + * @return the comparison * @since 1.4 */ - public static int compare (float x, float y) + public static int compare(float x, float y) { - if (isNaN (x)) - return isNaN (y) ? 0 : 1; - if (isNaN (y)) + if (isNaN(x)) + return isNaN(y) ? 0 : 1; + if (isNaN(y)) return -1; // recall that 0.0 == -0.0, so we convert to infinities and try again if (x == 0 && y == 0) @@ -506,23 +527,4 @@ public final class Float extends Number implements Comparable return x > y ? 1 : -1; } - - /** - * Compares the specified Object to this Float - * if and only if the Object is an instanceof - * Float. - * Otherwise it throws a ClassCastException - * - * @param o the Object to compare to. - * @return 0 if the Floats are the same, < 0 if this - * Float is less than the Float in - * in question, or > 0 if it is greater. - * @throws ClassCastException if the argument is not a Float - * - * @since 1.2 - */ - public int compareTo (Object o) - { - return compareTo ((Float) o); - } } diff --git a/libjava/java/lang/Integer.java b/libjava/java/lang/Integer.java index 128dbcaf77e..f9d901804f7 100644 --- a/libjava/java/lang/Integer.java +++ b/libjava/java/lang/Integer.java @@ -1,5 +1,5 @@ -/* java.lang.Integer - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +/* Integer.java -- object wrapper for int + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -48,36 +48,45 @@ package java.lang; * @author Paul Fisher * @author John Keiser * @author Warren Levy - * @since JDK 1.0 + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 */ public final class Integer extends Number implements Comparable { - // compatible with JDK 1.0.2+ + /** + * Compatible with JDK 1.0.2+. + */ private static final long serialVersionUID = 1360826667806852920L; /** - * The minimum value an int can represent is -2147483648. + * The minimum value an int can represent is -2147483648 (or + * -231). */ public static final int MIN_VALUE = 0x80000000; /** - * The maximum value an int can represent is 2147483647. + * The maximum value an int can represent is 2147483647 (or + * 231 - 1). */ public static final int MAX_VALUE = 0x7fffffff; /** - * The primitive type int is represented by this + * The primitive type int is represented by this * Class object. + * @since 1.1 */ - public static final Class TYPE = VMClassLoader.getPrimitiveClass ('I'); + public static final Class TYPE = VMClassLoader.getPrimitiveClass('I'); /** * The immutable value of this Integer. + * + * @serial the wrapped int */ private final int value; /** - * Create an Integer object representing the value of the + * Create an Integer object representing the value of the * int argument. * * @param value the value to use @@ -88,135 +97,73 @@ public final class Integer extends Number implements Comparable } /** - * Create an Integer object representing the value of the + * Create an Integer object representing the value of the * argument after conversion to an int. * - * @param s the string to convert. + * @param s the string to convert + * @throws NumberFormatException if the String does not contain an int + * @see #valueOf(String) */ - public Integer(String s) throws NumberFormatException + public Integer(String s) { - value = parseInt(s, 10); + value = parseInt(s, 10, false); } /** - * Return a hashcode representing this Object. - * - * Integer's hash code is calculated by simply returning its - * value. - * - * @return this Object's hash code. - */ - public int hashCode() - { - return value; - } - - /** - * If the Object is not null, is an - * instanceof Integer, and represents - * the same primitive int value return - * true. Otherwise false is returned. - */ - public boolean equals(Object obj) - { - return obj instanceof Integer && value == ((Integer)obj).value; - } - - /** - * Get the specified system property as an Integer. - * - * The decode() method will be used to interpret the value of - * the property. - * @param nm the name of the system property - * @return the system property as an Integer, or - * null if the property is not found or cannot be - * decoded as an Integer. - * @see java.lang.System#getProperty(java.lang.String) - * @see #decode(int) - */ - public static Integer getInteger(String nm) - { - return getInteger(nm, null); - } - - /** - * Get the specified system property as an Integer, or use a - * default int value if the property is not found or is not - * decodable. - * - * The decode() method will be used to interpret the value of - * the property. + * Converts the int to a String using + * the specified radix (base). If the radix exceeds + * Character.MIN_RADIX or Character.MAX_RADIX, 10 + * is used instead. If the result is negative, the leading character is + * '-' ('\\u002D'). The remaining characters come from + * Character.forDigit(digit, radix) ('0'-'9','a'-'z'). * - * @param nm the name of the system property - * @param val the default value to use if the property is not found or not - * a number. - * @return the system property as an Integer, or the default - * value if the property is not found or cannot be decoded as an - * Integer. - * @see java.lang.System#getProperty(java.lang.String) - * @see #decode(int) - * @see #getInteger(java.lang.String,java.lang.Integer) + * @param num the int to convert to String + * @param radix the radix (base) to use in the conversion + * @return the String representation of the argument */ - public static Integer getInteger(String nm, int val) + public static String toString(int num, int radix) { - Integer result = getInteger(nm, null); - return (result == null) ? new Integer(val) : result; - } + if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) + radix = 10; - /** - * Get the specified system property as an Integer, or use a - * default Integer value if the property is not found or is - * not decodable. - * - * The decode() method will be used to interpret the value of - * the property. - * - * @param nm the name of the system property - * @param val the default value to use if the property is not found or not - * a number. - * @return the system property as an Integer, or the default - * value if the property is not found or cannot be decoded as an - * Integer. - * @see java.lang.System#getProperty(java.lang.String) - * @see #decode(int) - * @see #getInteger(java.lang.String,int) - */ - public static Integer getInteger(String nm, Integer def) - { - String val = System.getProperty(nm); - if (val == null) return def; - try - { - return decode(val); - } - catch (NumberFormatException e) + // For negative numbers, print out the absolute value w/ a leading '-'. + // Use an array large enough for a binary number. + char[] buffer = new char[33]; + int i = 33; + boolean isNeg = false; + if (num < 0) { - return def; + isNeg = true; + num = -num; + + // When the value is MIN_VALUE, it overflows when made positive + if (num < 0) + { + buffer[--i] = digits[(int) (-(num + radix) % radix)]; + num = -(num / radix); + } } - } - private static String toUnsignedString(int num, int exp) - { - // Use an array large enough for a binary number. - int radix = 1 << exp; - int mask = radix - 1; - char[] buffer = new char[32]; - int i = 32; do { - buffer[--i] = Character.forDigit(num & mask, radix); - num = num >>> exp; + buffer[--i] = digits[num % radix]; + num /= radix; } - while (num != 0); + while (num > 0); - return String.valueOf(buffer, i, 32-i); + if (isNeg) + buffer[--i] = '-'; + + // Package constructor avoids an array copy. + return new String(buffer, i, 33 - i, true); } /** * Converts the int to a String assuming it is * unsigned in base 16. + * * @param i the int to convert to String - * @return the String representation of the argument. + * @return the String representation of the argument */ public static String toHexString(int i) { @@ -226,8 +173,9 @@ public final class Integer extends Number implements Comparable /** * Converts the int to a String assuming it is * unsigned in base 8. + * * @param i the int to convert to String - * @return the String representation of the argument. + * @return the String representation of the argument */ public static String toOctalString(int i) { @@ -237,8 +185,9 @@ public final class Integer extends Number implements Comparable /** * Converts the int to a String assuming it is * unsigned in base 2. + * * @param i the int to convert to String - * @return the String representation of the argument. + * @return the String representation of the argument */ public static String toBinaryString(int i) { @@ -248,335 +197,410 @@ public final class Integer extends Number implements Comparable /** * Converts the int to a String and assumes * a radix of 10. + * * @param i the int to convert to String - * @return the String representation of the argument. + * @return the String representation of the argument + * @see #toString(int, int) */ public static String toString(int i) { // This is tricky: in libgcj, String.valueOf(int) is a fast native // implementation. In Classpath it just calls back to - // Integer.toString(int,int). - return String.valueOf (i); + // Integer.toString(int, int). + return String.valueOf(i); } /** - * Converts the Integer value to a String and - * assumes a radix of 10. - * @return the String representation of this Integer. - */ - public String toString() - { - return toString (value); - } - - /** - * Converts the int to a String using - * the specified radix (base). - * @param i the int to convert to String. - * @param radix the radix (base) to use in the conversion. - * @return the String representation of the argument. + * Converts the specified String into an int + * using the specified radix (base). The string must not be null + * or empty. It may begin with an optional '-', which will negate the answer, + * provided that there are also valid digits. Each digit is parsed as if by + * Character.digit(d, radix), and must be in the range + * 0 to radix - 1. Finally, the result must be + * within MIN_VALUE to MAX_VALUE, inclusive. + * Unlike Double.parseDouble, you may not have a leading '+'. + * + * @param s the String to convert + * @param radix the radix (base) to use in the conversion + * @return the String argument converted to int + * @throws NumberFormatException if s cannot be parsed as an + * int */ - public static String toString(int num, int radix) + public static int parseInt(String str, int radix) { - if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) - radix = 10; - - // For negative numbers, print out the absolute value w/ a leading '-'. - // Use an array large enough for a binary number. - char[] buffer = new char[33]; - int i = 33; - boolean isNeg; - if (num < 0) - { - isNeg = true; - num = -(num); - - // When the value is MIN_VALUE, it overflows when made positive - if (num < 0) - { - buffer[--i] = Character.forDigit(-(num + radix) % radix, radix); - num = -(num / radix); - } - } - else - isNeg = false; - - do - { - buffer[--i] = Character.forDigit(num % radix, radix); - num /= radix; - } - while (num > 0); - - if (isNeg) - buffer[--i] = '-'; - - return String.valueOf(buffer, i, 33-i); + return parseInt(str, radix, false); } /** - * Creates a new Integer object using the String, - * assuming a radix of 10. - * @param s the String to convert. - * @return the new Integer. - * @see #Integer(java.lang.String) - * @see #parseInt(java.lang.String) - * @exception NumberFormatException thrown if the String - * cannot be parsed as an int. - */ - public static Integer valueOf(String s) throws NumberFormatException + * Converts the specified String into an int. + * This function assumes a radix of 10. + * + * @param s the String to convert + * @return the int value of s + * @throws NumberFormatException if s cannot be parsed as an + * int + * @see #parseInt(String, int) + */ + public static int parseInt(String s) { - return new Integer(parseInt(s)); + return parseInt(s, 10, false); } /** * Creates a new Integer object using the String * and specified radix (base). - * @param s the String to convert. - * @param radix the radix (base) to convert with. - * @return the new Integer. - * @see #parseInt(java.lang.String,int) - * @exception NumberFormatException thrown if the String - * cannot be parsed as an int. + * + * @param s the String to convert + * @param radix the radix (base) to convert with + * @return the new Integer + * @throws NumberFormatException if s cannot be parsed as an + * int + * @see #parseInt(String, int) */ public static Integer valueOf(String s, int radix) - throws NumberFormatException { - return new Integer(parseInt(s, radix)); + return new Integer(parseInt(s, radix, false)); } /** - * Converts the specified String into an int. - * This function assumes a radix of 10. + * Creates a new Integer object using the String, + * assuming a radix of 10. * * @param s the String to convert - * @return the int value of the String - * argument. - * @exception NumberFormatException thrown if the String - * cannot be parsed as an int. + * @return the new Integer + * @throws NumberFormatException if s cannot be parsed as an + * int + * @see #Integer(String) + * @see #parseInt(String) */ - public static int parseInt(String s) throws NumberFormatException + public static Integer valueOf(String s) { - return parseInt(s, 10); + return new Integer(parseInt(s, 10, false)); } /** - * Converts the specified String into an int - * using the specified radix (base). + * Return the value of this Integer as a byte. * - * @param s the String to convert - * @param radix the radix (base) to use in the conversion - * @return the String argument converted to int. - * @exception NumberFormatException thrown if the String - * cannot be parsed as a int. + * @return the byte value */ - public static int parseInt(String str, int radix) - throws NumberFormatException + public byte byteValue() { - final int len; - - if (str == null) - throw new NumberFormatException (); - - if ((len = str.length()) == 0 || - radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) - throw new NumberFormatException(); - - boolean isNeg = false; - int index = 0; - if (str.charAt(index) == '-') - if (len > 1) - { - isNeg = true; - index++; - } - else - throw new NumberFormatException(); - - return parseInt(str, index, len, isNeg, radix); + return (byte) value; } - private static int parseInt(String str, int index, int len, boolean isNeg, - int radix) - throws NumberFormatException + /** + * Return the value of this Integer as a short. + * + * @return the short value + */ + public short shortValue() { - int val = 0; - int digval; - - int max = MAX_VALUE / radix; - // We can't directly write `max = (MAX_VALUE + 1) / radix'. - // So instead we fake it. - if (isNeg && MAX_VALUE % radix == radix - 1) - ++max; - - for ( ; index < len; index++) - { - if (val < 0 || val > max) - throw new NumberFormatException(); - - if ((digval = Character.digit(str.charAt(index), radix)) < 0) - throw new NumberFormatException(); - - // Throw an exception for overflow if result is negative. - // However, we special-case the most negative value. - val = val * radix + digval; - if (val < 0 && (! isNeg || val != MIN_VALUE)) - throw new NumberFormatException(); - } + return (short) value; + } - return isNeg ? -(val) : val; + /** + * Return the value of this Integer. + * @return the int value + */ + public int intValue() + { + return value; } /** - * Convert the specified String into an Integer. - * The String may represent decimal, hexadecimal, or - * octal numbers. - * - * The String argument is interpreted based on the leading - * characters. Depending on what the String begins with, the base will be - * interpreted differently: + * Return the value of this Integer as a long. * - * - * - * - * - * - * - * - *
Leading
Characters		Base
#16
0x16
0X16
08
Anything
Else		10
- * - * @param str the String to interpret. - * @return the value of the String as an Integer. - * @exception NumberFormatException thrown if the String - * cannot be parsed as an int. + * @return the long value */ - public static Integer decode(String str) throws NumberFormatException + public long longValue() { - boolean isNeg = false; - int index = 0; - int radix = 10; - final int len; - - if (str == null || (len = str.length()) == 0) - throw new NumberFormatException("string null or empty"); - - // Negative numbers are always radix 10. - if (str.charAt(index) == '-') - { - radix = 10; - index++; - isNeg = true; - } - else if (str.charAt(index) == '#') - { - radix = 16; - index++; - } - else if (str.charAt(index) == '0') - { - // Check if str is just "0" - if (len == 1) - return new Integer(0); + return value; + } - index++; - if (str.charAt(index) == 'x' || str.charAt(index) == 'X') - { - radix = 16; - index++; - } - else - radix = 8; - } + /** + * Return the value of this Integer as a float. + * + * @return the float value + */ + public float floatValue() + { + return value; + } - if (index >= len) - throw new NumberFormatException("empty value"); + /** + * Return the value of this Integer as a double. + * + * @return the double value + */ + public double doubleValue() + { + return value; + } - return new Integer(parseInt(str, index, len, isNeg, radix)); + /** + * Converts the Integer value to a String and + * assumes a radix of 10. + * + * @return the String representation + */ + public String toString() + { + return String.valueOf(value); } - /** Return the value of this Integer as a byte. - ** @return the value of this Integer as a byte. - **/ - public byte byteValue() + /** + * Return a hashcode representing this Object. Integer's hash + * code is simply its value. + * + * @return this Object's hash code + */ + public int hashCode() { - return (byte) value; + return value; } - /** Return the value of this Integer as a short. - ** @return the value of this Integer as a short. - **/ - public short shortValue() + /** + * Returns true if obj is an instance of + * Integer and represents the same int value. + * + * @param obj the object to compare + * @return whether these Objects are semantically equal + */ + public boolean equals(Object obj) { - return (short) value; + return obj instanceof Integer && value == ((Integer) obj).value; } - /** Return the value of this Integer as an int. - ** @return the value of this Integer as an int. - **/ - public int intValue() + /** + * Get the specified system property as an Integer. The + * decode() method will be used to interpret the value of + * the property. + * + * @param nm the name of the system property + * @return the system property as an Integer, or null if the + * property is not found or cannot be decoded + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Integer getInteger(String nm) { - return value; + return getInteger(nm, null); } - /** Return the value of this Integer as a long. - ** @return the value of this Integer as a long. - **/ - public long longValue() + /** + * Get the specified system property as an Integer, or use a + * default int value if the property is not found or is not + * decodable. The decode() method will be used to interpret + * the value of the property. + * + * @param nm the name of the system property + * @param val the default value + * @return the value of the system property, or the default + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Integer getInteger(String nm, int val) { - return value; + Integer result = getInteger(nm, null); + return result == null ? new Integer(val) : result; } - /** Return the value of this Integer as a float. - ** @return the value of this Integer as a float. - **/ - public float floatValue() + /** + * Get the specified system property as an Integer, or use a + * default Integer value if the property is not found or is + * not decodable. The decode() method will be used to + * interpret the value of the property. + * + * @param nm the name of the system property + * @param val the default value + * @return the value of the system property, or the default + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Integer getInteger(String nm, Integer def) { - return value; + if (nm == null || "".equals(nm)) + return def; + nm = System.getProperty(nm); + if (nm == null) + return def; + try + { + return decode(nm); + } + catch (NumberFormatException e) + { + return def; + } } - /** Return the value of this Integer as a double. - ** @return the value of this Integer as a double. - **/ - public double doubleValue() + /** + * Convert the specified String into an Integer. + * The String may represent decimal, hexadecimal, or + * octal numbers. + * + *

The extended BNF grammar is as follows:
+ * 

+   * DecodableString:
+   *      ( [ - ] DecimalNumber )
+   *    | ( [ - ] ( 0x | 0X
+   *              | # ) HexDigit { HexDigit } )
+   *    | ( [ - ] 0 { OctalDigit } )
+   * DecimalNumber:
+   *        DecimalDigit except '0' { DecimalDigit }
+   * DecimalDigit:
+   *        Character.digit(d, 10) has value 0 to 9
+   * OctalDigit:
+   *        Character.digit(d, 8) has value 0 to 7
+   * DecimalDigit:
+   *        Character.digit(d, 16) has value 0 to 15
+   *
+ * Finally, the value must be in the range MIN_VALUE to + * MAX_VALUE, or an exception is thrown. + * + * @param s the String to interpret + * @return the value of the String as an Integer + * @throws NumberFormatException if s cannot be parsed as a + * int + * @throws NullPointerException if s is null + * @since 1.2 + */ + public static Integer decode(String str) { - return value; + return new Integer(parseInt(str, 10, true)); } /** - * Compare two Integers numerically by comparing their - * int values. - * @return a positive value if this Integer is greater - * in value than the argument Integer; a negative value - * if this Integer is smaller in value than the argument - * Integer; and 0, zero, if this - * Integer is equal in value to the argument - * Integer. + * Compare two Integers numerically by comparing their int + * values. The result is positive if the first is greater, negative if the + * second is greater, and 0 if the two are equal. * + * @param i the Integer to compare + * @return the comparison * @since 1.2 */ public int compareTo(Integer i) { - if (this.value == i.value) + if (value == i.value) return 0; - // Returns just -1 or 1 on inequality; doing math might overflow. - if (this.value > i.value) - return 1; - - return -1; + return value > i.value ? 1 : -1; } /** - * Behaves like compareTo(java.lang.Integer) unless the Object - * is not a Integer. Then it throws a - * ClassCastException. - * @exception ClassCastException if the argument is not a - * Integer. + * Behaves like compareTo(Integer) unless the Object + * is not an Integer. * + * @param o the object to compare + * @return the comparison + * @throws ClassCastException if the argument is not an Integer + * @see #compareTo(Integer) + * @see Comparable * @since 1.2 */ public int compareTo(Object o) { - return compareTo((Integer)o); + return compareTo((Integer) o); + } + + /** + * Helper for converting unsigned numbers to String. + * + * @param num the number + * @param exp log2(digit) (ie. 1, 3, or 4 for binary, oct, hex) + */ + // Package visible for use by Long. + static String toUnsignedString(int num, int exp) + { + // Use an array large enough for a binary number. + int mask = (1 << exp) - 1; + char[] buffer = new char[32]; + int i = 32; + do + { + buffer[--i] = digits[num & mask]; + num >>>= exp; + } + while (num != 0); + + // Package constructor avoids an array copy. + return new String(buffer, i, 32 - i, true); + } + + /** + * Helper for parsing ints, used by Integer, Short, and Byte. + * + * @param str the string to parse + * @param radix the radix to use, must be 10 if decode is true + * @param decode if called from decode + * @return the parsed int value + * @throws NumberFormatException if there is an error + * @throws NullPointerException if decode is true and str if null + * @see #parseInt(String, int) + * @see #decode(String) + * @see Byte#parseInt(String, int) + * @see Short#parseInt(String, int) + */ + static int parseInt(String str, int radix, boolean decode) + { + if (! decode && str == null) + throw new NumberFormatException(); + int index = 0; + int len = str.length(); + boolean isNeg = false; + if (len == 0) + throw new NumberFormatException(); + int ch = str.charAt(index); + if (ch == '-') + { + if (len == 1) + throw new NumberFormatException(); + isNeg = true; + ch = str.charAt(++index); + } + if (decode) + { + if (ch == '0') + { + if (++index == len) + return 0; + if ((str.charAt(index) & ~('x' ^ 'X')) == 'X') + { + radix = 16; + index++; + } + else + radix = 8; + } + else if (ch == '#') + { + radix = 16; + index++; + } + } + if (index == len) + throw new NumberFormatException(); + + int max = MAX_VALUE / radix; + // We can't directly write `max = (MAX_VALUE + 1) / radix'. + // So instead we fake it. + if (isNeg && MAX_VALUE % radix == radix - 1) + ++max; + + int val = 0; + while (index < len) + { + if (val < 0 || val > max) + throw new NumberFormatException(); + + ch = Character.digit(str.charAt(index++), radix); + val = val * radix + ch; + if (ch < 0 || (val < 0 && (! isNeg || val != MIN_VALUE))) + throw new NumberFormatException(); + } + return isNeg ? -val : val; } } diff --git a/libjava/java/lang/Long.java b/libjava/java/lang/Long.java index 42f2761dd18..1420e58d6c4 100644 --- a/libjava/java/lang/Long.java +++ b/libjava/java/lang/Long.java @@ -1,5 +1,5 @@ -/* java.lang.Long - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +/* Long.java -- object wrapper for long + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -39,8 +39,8 @@ exception statement from your version. */ package java.lang; /** - * Instances of class Double represent primitive - * double values. + * Instances of class Long represent primitive + * long values. * * Additionally, this class provides various helper functions and variables * related to longs. @@ -48,38 +48,45 @@ package java.lang; * @author Paul Fisher * @author John Keiser * @author Warren Levy - * @since JDK 1.0 + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 */ public final class Long extends Number implements Comparable { - // compatible with JDK 1.0.2+ - static final long serialVersionUID = 4290774380558885855L; + /** + * Compatible with JDK 1.0.2+. + */ + private static final long serialVersionUID = 4290774380558885855L; /** * The minimum value a long can represent is - * -9223372036854775808. + * -9223372036854775808L (or -263). */ public static final long MIN_VALUE = 0x8000000000000000L; /** * The maximum value a long can represent is - * 9223372036854775807. + * 9223372036854775807 (or 263 - 1). */ public static final long MAX_VALUE = 0x7fffffffffffffffL; /** - * The primitive type long is represented by this + * The primitive type long is represented by this * Class object. + * @since 1.1 */ public static final Class TYPE = VMClassLoader.getPrimitiveClass ('J'); /** * The immutable value of this Long. + * + * @serial the wrapped long */ private final long value; /** - * Create a Long object representing the value of the + * Create a Long object representing the value of the * long argument. * * @param value the value to use @@ -90,504 +97,518 @@ public final class Long extends Number implements Comparable } /** - * Create a Long object representing the value of the + * Create a Long object representing the value of the * argument after conversion to a long. * - * @param s the string to convert. + * @param s the string to convert + * @throws NumberFormatException if the String does not contain a long + * @see #valueOf(String) */ - public Long(String s) throws NumberFormatException + public Long(String s) { - value = parseLong(s, 10); + value = parseLong(s, 10, false); } /** - * If the Object is not null, is an - * instanceof Long, and represents - * the same primitive long value return - * true. Otherwise false is returned. + * Converts the long to a String using + * the specified radix (base). If the radix exceeds + * Character.MIN_RADIX or Character.MAX_RADIX, 10 + * is used instead. If the result is negative, the leading character is + * '-' ('\\u002D'). The remaining characters come from + * Character.forDigit(digit, radix) ('0'-'9','a'-'z'). + * + * @param num the long to convert to String + * @param radix the radix (base) to use in the conversion + * @return the String representation of the argument */ - public boolean equals(Object obj) + public static String toString(long num, int radix) { - return obj instanceof Long && ((Long)obj).value == value; + // Use the Integer toString for efficiency if possible. + if ((int) num == num) + return Integer.toString((int) num, radix); + + if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) + radix = 10; + + // For negative numbers, print out the absolute value w/ a leading '-'. + // Use an array large enough for a binary number. + char[] buffer = new char[65]; + int i = 65; + boolean isNeg = false; + if (num < 0) + { + isNeg = true; + num = -num; + + // When the value is MIN_VALUE, it overflows when made positive + if (num < 0) + { + buffer[--i] = digits[(int) (-(num + radix) % radix)]; + num = -(num / radix); + } + } + + do + { + buffer[--i] = digits[(int) (num % radix)]; + num /= radix; + } + while (num > 0); + + if (isNeg) + buffer[--i] = '-'; + + // Package constructor avoids an array copy. + return new String(buffer, i, 65 - i, true); } /** - * Return a hashcode representing this Object. + * Converts the long to a String assuming it is + * unsigned in base 16. * - * Long's hash code is calculated by simply returning its - * value. + * @param l the long to convert to String + * @return the String representation of the argument + */ + public static String toHexString(long l) + { + return toUnsignedString(l, 4); + } + + /** + * Converts the long to a String assuming it is + * unsigned in base 8. * - * @return this Object's hash code. + * @param l the long to convert to String + * @return the String representation of the argument */ - public int hashCode() + public static String toOctalString(long l) { - return (int)(value^(value>>>32)); + return toUnsignedString(l, 3); } /** - * Get the specified system property as a Long. + * Converts the long to a String assuming it is + * unsigned in base 2. * - * A method similar to Integer's decode() will be - * used to interpret the value of the property. - * - * @param nm the name of the system property - * @return the system property as an Long, or - * null if the property is not found or cannot be - * decoded as a Long. - * @see java.lang.System#getProperty(java.lang.String) - * @see java.lang.Integer#decode(int) + * @param l the long to convert to String + * @return the String representation of the argument */ - public static Long getLong(String nm) + public static String toBinaryString(long l) { - return getLong(nm, null); + return toUnsignedString(l, 1); } /** - * Get the specified system property as an Long, or use a - * default long value if the property is not found or is not - * decodable. - * - * A method similar to Integer's decode() will be - * used to interpret the value of the property. - * - * @param nm the name of the system property - * @param val the default value to use if the property is not found or not - * a number. - * @return the system property as a Long, or the default - * value if the property is not found or cannot be decoded as a - * Long. - * @see java.lang.System#getProperty(java.lang.String) - * @see java.lang.Integer#decode(int) - * @see #getLong(java.lang.String,java.lang.Long) + * Converts the long to a String and assumes + * a radix of 10. + * + * @param num the long to convert to String + * @return the String representation of the argument + * @see #toString(long, int) */ - public static Long getLong(String nm, long val) + public static String toString(long num) { - Long result = getLong(nm, null); - return (result == null) ? new Long(val) : result; + return toString(num, 10); } /** - * Get the specified system property as an Long, or use a - * default Long value if the property is not found or is - * not decodable. - * - * The decode() method will be used to interpret the value of - * the property. + * Converts the specified String into an int + * using the specified radix (base). The string must not be null + * or empty. It may begin with an optional '-', which will negate the answer, + * provided that there are also valid digits. Each digit is parsed as if by + * Character.digit(d, radix), and must be in the range + * 0 to radix - 1. Finally, the result must be + * within MIN_VALUE to MAX_VALUE, inclusive. + * Unlike Double.parseDouble, you may not have a leading '+'; and 'l' or + * 'L' as the last character is only valid in radices 22 or greater, where + * it is a digit and not a type indicator. * - * @param nm the name of the system property - * @param val the default value to use if the property is not found or not - * a number. - * @return the system property as an Long, or the default - * value if the property is not found or cannot be decoded as an - * Long. - * @see java.lang.System#getProperty(java.lang.String) - * @see java.lang.Integer#decode(int) - * @see #getLong(java.lang.String,long) + * @param s the String to convert + * @param radix the radix (base) to use in the conversion + * @return the String argument converted to long + * @throws NumberFormatException if s cannot be parsed as a + * long */ - public static Long getLong(String nm, Long def) + public static long parseLong(String str, int radix) { - String val = System.getProperty(nm); - if (val == null) - return def; - try - { - return decode(nm); - } - catch (NumberFormatException e) - { - return def; - } + return parseLong(str, radix, false); } - private static String toUnsignedString(long num, int exp) + /** + * Converts the specified String into a long. + * This function assumes a radix of 10. + * + * @param s the String to convert + * @return the int value of s + * @throws NumberFormatException if s cannot be parsed as a + * long + * @see #parseLong(String, int) + */ + public static long parseLong(String s) { - // Use an array large enough for a binary number. - int radix = 1 << exp; - int mask = radix - 1; - char[] buffer = new char[64]; - int i = 64; - do - { - buffer[--i] = Character.forDigit((int) num & mask, radix); - num = num >>> exp; - } - while (num != 0); + return parseLong(s, 10, false); + } - return String.valueOf(buffer, i, 64-i); + /** + * Creates a new Long object using the String + * and specified radix (base). + * + * @param s the String to convert + * @param radix the radix (base) to convert with + * @return the new Long + * @throws NumberFormatException if s cannot be parsed as a + * long + * @see #parseLong(String, int) + */ + public static Long valueOf(String s, int radix) + { + return new Long(parseLong(s, radix, false)); } /** - * Converts the long to a String assuming it is - * unsigned in base 16. - * @param i the long to convert to String - * @return the String representation of the argument. + * Creates a new Long object using the String, + * assuming a radix of 10. + * + * @param s the String to convert + * @return the new Long + * @throws NumberFormatException if s cannot be parsed as a + * long + * @see #Long(String) + * @see #parseLong(String) */ - public static String toHexString(long i) + public static Long valueOf(String s) { - return toUnsignedString(i, 4); + return new Long(parseLong(s, 10, false)); } /** - * Converts the long to a String assuming it is - * unsigned in base 8. - * @param i the long to convert to String - * @return the String representation of the argument. + * Convert the specified String into a Long. + * The String may represent decimal, hexadecimal, or + * octal numbers. + * + *

The extended BNF grammar is as follows:
+ * 

+   * DecodableString:
+   *      ( [ - ] DecimalNumber )
+   *    | ( [ - ] ( 0x | 0X
+   *              | # ) HexDigit { HexDigit } )
+   *    | ( [ - ] 0 { OctalDigit } )
+   * DecimalNumber:
+   *        DecimalDigit except '0' { DecimalDigit }
+   * DecimalDigit:
+   *        Character.digit(d, 10) has value 0 to 9
+   * OctalDigit:
+   *        Character.digit(d, 8) has value 0 to 7
+   * DecimalDigit:
+   *        Character.digit(d, 16) has value 0 to 15
+   *
+ * Finally, the value must be in the range MIN_VALUE to + * MAX_VALUE, or an exception is thrown. Note that you cannot + * use a trailing 'l' or 'L', unlike in Java source code. + * + * @param s the String to interpret + * @return the value of the String as a Long + * @throws NumberFormatException if s cannot be parsed as a + * long + * @throws NullPointerException if s is null + * @since 1.2 */ - public static String toOctalString(long i) + public static Long decode(String str) { - return toUnsignedString(i, 3); + return new Long(parseLong(str, 10, true)); } /** - * Converts the long to a String assuming it is - * unsigned in base 2. - * @param i the long to convert to String - * @return the String representation of the argument. + * Return the value of this Long as a byte. + * + * @return the byte value */ - public static String toBinaryString(long i) { - return toUnsignedString(i, 1); + public byte byteValue() + { + return (byte) value; } /** - * Converts the long to a String and assumes - * a radix of 10. - * @param num the long to convert to String - * @return the String representation of the argument. - */ - public static String toString(long num) + * Return the value of this Long as a short. + * + * @return the short value + */ + public short shortValue() { - // Use the Integer toString for efficiency if possible. - if (num <= Integer.MAX_VALUE && num >= Integer.MIN_VALUE) - return Integer.toString((int) num); + return (short) value; + } - // Use an array large enough for "-9223372036854775808"; i.e. 20 chars. - char[] buffer = new char[20]; - int i = 20; - boolean isNeg; - if (num < 0) - { - isNeg = true; - num = -(num); - if (num < 0) - { - // Must be MIN_VALUE, so handle this special case. - buffer[--i] = '8'; - num = 922337203685477580L; - } - } - else - isNeg = false; + /** + * Return the value of this Long as an int. + * + * @return the int value + */ + public int intValue() + { + return (int) value; + } - do - { - buffer[--i] = (char) ((int) '0' + (num % 10)); - num /= 10; - } - while (num > 0); + /** + * Return the value of this Long. + * + * @return the long value + */ + public long longValue() + { + return value; + } - if (isNeg) - buffer[--i] = '-'; + /** + * Return the value of this Long as a float. + * + * @return the float value + */ + public float floatValue() + { + return value; + } - return String.valueOf(buffer, i, 20-i); + /** + * Return the value of this Long as a double. + * + * @return the double value + */ + public double doubleValue() + { + return value; } /** * Converts the Long value to a String and * assumes a radix of 10. - * @return the String representation of this Long. - */ + * + * @return the String representation + */ public String toString() { - return toString(value); + return toString(value, 10); } - + /** - * Converts the long to a String using - * the specified radix (base). - * @param num the long to convert to String. - * @param radix the radix (base) to use in the conversion. - * @return the String representation of the argument. + * Return a hashcode representing this Object. Long's hash + * code is calculated by (int) (value ^ (value >> 32)). + * + * @return this Object's hash code */ - public static String toString(long num, int radix) + public int hashCode() { - // Use optimized method for the typical case. - if (radix == 10 || - radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) - return toString(num); - - // Use the Integer toString for efficiency if possible. - if (num <= Integer.MAX_VALUE && num >= Integer.MIN_VALUE) - return Integer.toString((int) num, radix); - - // For negative numbers, print out the absolute value w/ a leading '-'. - // Use an array large enough for a binary number. - char[] buffer = new char[65]; - int i = 65; - boolean isNeg; - if (num < 0) - { - isNeg = true; - num = -(num); - - // When the value is MIN_VALUE, it overflows when made positive - if (num < 0) - { - buffer[--i] = Character.forDigit((int) (-(num + radix) % radix), - radix); - num = -(num / radix); - } - } - else - isNeg = false; + return (int) (value ^ (value >>> 32)); + } - do - { - buffer[--i] = Character.forDigit((int) (num % radix), radix); - num /= radix; - } - while (num > 0); + /** + * Returns true if obj is an instance of + * Long and represents the same long value. + * + * @param obj the object to compare + * @return whether these Objects are semantically equal + */ + public boolean equals(Object obj) + { + return obj instanceof Long && value == ((Long) obj).value; + } - if (isNeg) - buffer[--i] = '-'; + /** + * Get the specified system property as a Long. The + * decode() method will be used to interpret the value of + * the property. + * + * @param nm the name of the system property + * @return the system property as a Long, or null if the + * property is not found or cannot be decoded + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Long getLong(String nm) + { + return getLong(nm, null); + } - return String.valueOf(buffer, i, 65-i); + /** + * Get the specified system property as a Long, or use a + * default long value if the property is not found or is not + * decodable. The decode() method will be used to interpret + * the value of the property. + * + * @param nm the name of the system property + * @param val the default value + * @return the value of the system property, or the default + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Long getLong(String nm, long val) + { + Long result = getLong(nm, null); + return result == null ? new Long(val) : result; } - + /** - * Creates a new Long object using the String, - * assuming a radix of 10. - * @param s the String to convert. - * @return the new Long. - * @see #Long(java.lang.String) - * @see #parseLong(java.lang.String) - * @exception NumberFormatException thrown if the String - * cannot be parsed as a long. - */ - public static Long valueOf(String s) throws NumberFormatException + * Get the specified system property as a Long, or use a + * default Long value if the property is not found or is + * not decodable. The decode() method will be used to + * interpret the value of the property. + * + * @param nm the name of the system property + * @param val the default value + * @return the value of the system property, or the default + * @throws SecurityException if accessing the system property is forbidden + * @see System#getProperty(String) + * @see #decode(String) + */ + public static Long getLong(String nm, Long def) { - return new Long(parseLong(s)); + if (nm == null || "".equals(nm)) + return def; + nm = System.getProperty(nm); + if (nm == null) + return def; + try + { + return decode(nm); + } + catch (NumberFormatException e) + { + return def; + } } /** - * Creates a new Long object using the String - * and specified radix (base). - * @param s the String to convert. - * @param radix the radix (base) to convert with. - * @return the new Long. - * @see #parseLong(java.lang.String,int) - * @exception NumberFormatException thrown if the String - * cannot be parsed as a long. - */ - public static Long valueOf(String s, int radix) throws NumberFormatException + * Compare two Longs numerically by comparing their long + * values. The result is positive if the first is greater, negative if the + * second is greater, and 0 if the two are equal. + * + * @param l the Long to compare + * @return the comparison + * @since 1.2 + */ + public int compareTo(Long l) { - return new Long(parseLong(s, radix)); + if (value == l.value) + return 0; + // Returns just -1 or 1 on inequality; doing math might overflow the long. + return value > l.value ? 1 : -1; } /** - * Converts the specified String into a long. - * This function assumes a radix of 10. + * Behaves like compareTo(Long) unless the Object + * is not a Long. * - * @param s the String to convert - * @return the long value of the String - * argument. - * @exception NumberFormatException thrown if the String - * cannot be parsed as a long. + * @param o the object to compare + * @return the comparison + * @throws ClassCastException if the argument is not a Long + * @see #compareTo(Long) + * @see Comparable + * @since 1.2 */ - public static long parseLong(String s) throws NumberFormatException + public int compareTo(Object o) { - return parseLong(s, 10); + return compareTo((Long) o); } /** - * Converts the specified String into a long - * using the specified radix (base). + * Helper for converting unsigned numbers to String. * - * @param s the String to convert - * @param radix the radix (base) to use in the conversion - * @return the String argument converted to long. - * @exception NumberFormatException thrown if the String - * cannot be parsed as a long. + * @param num the number + * @param exp log2(digit) (ie. 1, 3, or 4 for binary, oct, hex) */ - public static long parseLong(String str, int radix) - throws NumberFormatException + private static String toUnsignedString(long num, int exp) { - final int len; + // Use the Integer toUnsignedString for efficiency if possible. + // If NUM<0 then this particular optimization doesn't work + // properly. + if (num >= 0 && (int) num == num) + return Integer.toUnsignedString((int) num, exp); - if ((len = str.length()) == 0 || radix < Character.MIN_RADIX - || radix > Character.MAX_RADIX) - throw new NumberFormatException(); + // Use an array large enough for a binary number. + int mask = (1 << exp) - 1; + char[] buffer = new char[64]; + int i = 64; + do + { + buffer[--i] = digits[(int) num & mask]; + num >>>= exp; + } + while (num != 0); - boolean isNeg = false; - int index = 0; - if (str.charAt(index) == '-') - if (len > 1) - { - isNeg = true; - index++; - } - else - throw new NumberFormatException(); - - return parseLong(str, index, len, isNeg, radix); + // Package constructor avoids an array copy. + return new String(buffer, i, 64 - i, true); } - public static Long decode(String str) throws NumberFormatException + /** + * Helper for parsing longs. + * + * @param str the string to parse + * @param radix the radix to use, must be 10 if decode is true + * @param decode if called from decode + * @return the parsed long value + * @throws NumberFormatException if there is an error + * @throws NullPointerException if decode is true and str is null + * @see #parseLong(String, int) + * @see #decode(String) + */ + private static long parseLong(String str, int radix, boolean decode) { - boolean isNeg = false; + if (! decode && str == null) + throw new NumberFormatException(); int index = 0; - int radix = 10; - final int len; - - if ((len = str.length()) == 0) + int len = str.length(); + boolean isNeg = false; + if (len == 0) throw new NumberFormatException(); - - // Negative numbers are always radix 10. - if (str.charAt(0) == '-') + int ch = str.charAt(index); + if (ch == '-') { - radix = 10; - index++; + if (len == 1) + throw new NumberFormatException(); isNeg = true; + ch = str.charAt(++index); } - else if (str.charAt(index) == '#') - { - radix = 16; - index++; - } - else if (str.charAt(index) == '0') + if (decode) { - // Check if str is just "0" - if (len == 1) - return new Long(0L); - - index++; - if (str.charAt(index) == 'x') + if (ch == '0') + { + if (++index == len) + return 0; + if ((str.charAt(index) & ~('x' ^ 'X')) == 'X') + { + radix = 16; + index++; + } + else + radix = 8; + } + else if (ch == '#') { radix = 16; index++; } - else - radix = 8; } - - if (index >= len) + if (index == len) throw new NumberFormatException(); - return new Long(parseLong(str, index, len, isNeg, radix)); - } - - private static long parseLong(String str, int index, int len, boolean isNeg, - int radix) throws NumberFormatException - { - long val = 0; - int digval; - long max = MAX_VALUE / radix; // We can't directly write `max = (MAX_VALUE + 1) / radix'. // So instead we fake it. if (isNeg && MAX_VALUE % radix == radix - 1) ++max; - for ( ; index < len; index++) + long val = 0; + while (index < len) { if (val < 0 || val > max) throw new NumberFormatException(); - if ((digval = Character.digit(str.charAt(index), radix)) < 0) + ch = Character.digit(str.charAt(index++), radix); + val = val * radix + ch; + if (ch < 0 || (val < 0 && (! isNeg || val != MIN_VALUE))) throw new NumberFormatException(); - - // Throw an exception for overflow if result is negative. - // However, we special-case the most negative value. - val = val * radix + digval; - if (val < 0 && (! isNeg || val != MIN_VALUE)) - throw new NumberFormatException(); } - - return isNeg ? -(val) : val; - } - - /** Return the value of this Long as an short. - ** @return the value of this Long as an short. - **/ - public byte byteValue() - { - return (byte) value; - } - - /** Return the value of this Long as an short. - ** @return the value of this Long as an short. - **/ - public short shortValue() - { - return (short) value; - } - - /** Return the value of this Long as an int. - ** @return the value of this Long as an int. - **/ - public int intValue() - { - return (int) value; - } - - /** Return the value of this Long as a long. - ** @return the value of this Long as a long. - **/ - public long longValue() - { - return value; - } - - /** Return the value of this Long as a float. - ** @return the value of this Long as a float. - **/ - public float floatValue() - { - return value; - } - - /** Return the value of this Long as a double. - ** @return the value of this Long as a double. - **/ - public double doubleValue() - { - return value; - } - - /** - * Compare two Longs numerically by comparing their - * long values. - * @return a positive value if this Long is greater - * in value than the argument Long; a negative value - * if this Long is smaller in value than the argument - * Long; and 0, zero, if this - * Long is equal in value to the argument - * Long. - * - * @since 1.2 - */ - public int compareTo(Long l) - { - if (this.value == l.value) - return 0; - - // Returns just -1 or 1 on inequality; doing math might overflow the long. - if (this.value > l.value) - return 1; - - return -1; - } - - /** - * Behaves like compareTo(java.lang.Long) unless the Object - * is not a Long. Then it throws a - * ClassCastException. - * @exception ClassCastException if the argument is not a - * Long. - * - * @since 1.2 - */ - public int compareTo(Object o) - { - return compareTo((Long)o); + return isNeg ? -val : val; } } diff --git a/libjava/java/lang/Number.java b/libjava/java/lang/Number.java index 0d2e5d18cae..eb230b060ca 100644 --- a/libjava/java/lang/Number.java +++ b/libjava/java/lang/Number.java @@ -1,5 +1,5 @@ -/* java.lang.Number - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* Number.java =- abstract superclass of numeric objects + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -41,54 +41,91 @@ package java.lang; import java.io.Serializable; /** - ** Number is a generic superclass of all the numeric classes, namely - ** Byte, Short, Integer, - ** Long, Float, and Double. - ** - ** It provides ways to convert from any one value to any other. - ** - ** @author Paul Fisher - ** @author John Keiser - ** @author Warren Levy - ** @since JDK1.0 - **/ + * Number is a generic superclass of all the numeric classes, including + * the wrapper classes {@link Byte}, {@link Short}, {@link Integer}, + * {@link Long}, {@link Float}, and {@link Double}. Also worth mentioning + * are the classes in {@link java.math}. + * + * It provides ways to convert numeric objects to any primitive. + * + * @author Paul Fisher + * @author John Keiser + * @author Warren Levy + * @author Eric Blake + * @since 1.0 + * @status updated to 1.4 + */ public abstract class Number implements Serializable { - /** Return the value of this Number as a byte. - ** @return the value of this Number as a byte. - **/ - public byte byteValue() - { - return (byte) intValue(); - } + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -8742448824652078965L; - /** Return the value of this Number as a short. - ** @return the value of this Number as a short. - **/ - public short shortValue() + /** + * Table for calculating digits, used in Character, Long, and Integer. + */ + static final char[] digits = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', + 'u', 'v', 'w', 'x', 'y', 'z' + }; + + /** + * The basic constructor (often called implicitly). + */ + public Number() { - return (short) intValue(); } - /** Return the value of this Number as an int. - ** @return the value of this Number as an int. - **/ + /** + * Return the value of this Number as an int. + * + * @return the int value + */ public abstract int intValue(); - /** Return the value of this Number as a long. - ** @return the value of this Number as a long. - **/ + /** + * Return the value of this Number as a long. + * + * @return the long value + */ public abstract long longValue(); - /** Return the value of this Number as a float. - ** @return the value of this Number as a float. - **/ + /** + * Return the value of this Number as a float. + * + * @return the float value + */ public abstract float floatValue(); - /** Return the value of this Number as a float. - ** @return the value of this Number as a float. - **/ + /** + * Return the value of this Number as a float. + * + * @return the double value + */ public abstract double doubleValue(); - private static final long serialVersionUID = -8742448824652078965L; + /** + * Return the value of this Number as a byte. + * + * @return the byte value + * @since 1.1 + */ + public byte byteValue() + { + return (byte) intValue(); + } + + /** + * Return the value of this Number as a short. + * + * @return the short value + * @since 1.1 + */ + public short shortValue() + { + return (short) intValue(); + } } diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index b485ffecfcf..2c814e1f797 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -112,6 +112,12 @@ public final class String implements Serializable, Comparable, CharSequence init(data, offset, count, false); } + // This is used by Integer.toString(int,int). + String (char[] data, int offset, int count, boolean dont_copy) + { + init(data, offset, count, dont_copy); + } + public String (byte[] byteArray) { this (byteArray, 0, byteArray.length); diff --git a/libjava/java/lang/Void.java b/libjava/java/lang/Void.java index 2ac72f26a20..b2d64dd5b72 100644 --- a/libjava/java/lang/Void.java +++ b/libjava/java/lang/Void.java @@ -1,5 +1,5 @@ -/* java.lang.Void - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +/* Void.class - defines void.class + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ 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 @@ -38,30 +38,29 @@ exception statement from your version. */ package java.lang; -/* Written using "Java Class Libraries", 2nd edition, plus online - * API docs for JDK 1.2 beta from http://www.javasoft.com. - * Status: Complete. - */ - /** - * Void is a placeholder class so that the variable Void.TYPE can be - * supported for reflection return types. + * Void is a placeholder class so that the variable Void.TYPE + * (also available as void.class) can be supported for + * reflection return types. + * + *

This class could be Serializable, but that is up to Sun. * * @author Paul Fisher * @author John Keiser - * @author Per Bothner - * @since JDK1.1 + * @author Eric Blake + * @since 1.1 + * @status updated to 1.4 */ public final class Void { /** - * The return type void is represented by this + * The return type void is represented by this * Class object. */ public static final Class TYPE = VMClassLoader.getPrimitiveClass('V'); /** - * Don't allow Void objects to be made. + * Void is non-instantiable. */ private Void() { } } diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index 328f1ad3bc5..0d30a35af51 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -456,9 +456,8 @@ java::lang::String::init(jcharArray chars, jint offset, jint count, } else { - JvAssert (offset == 0); array = chars; - pdst = elements (array); + pdst = &(elements(array)[offset]); } data = array;