Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
@@ -365,16 +365,13 @@ public class BigDecimal extends Number implements Comparable
|
||||
|
||||
// quotients are the same, so compare remainders
|
||||
|
||||
// remove trailing zeros
|
||||
if (thisParts[1].equals (BigInteger.valueOf (0)) == false)
|
||||
while (thisParts[1].mod (BigInteger.valueOf (10)).equals
|
||||
(BigInteger.valueOf (0)))
|
||||
thisParts[1] = thisParts[1].divide (BigInteger.valueOf (10));
|
||||
// again...
|
||||
if (valParts[1].equals(BigInteger.valueOf (0)) == false)
|
||||
while (valParts[1].mod (BigInteger.valueOf (10)).equals
|
||||
(BigInteger.valueOf (0)))
|
||||
valParts[1] = valParts[1].divide (BigInteger.valueOf (10));
|
||||
// Add some trailing zeros to the remainder with the smallest scale
|
||||
if (scale < val.scale)
|
||||
thisParts[1] = thisParts[1].multiply
|
||||
(BigInteger.valueOf (10).pow (val.scale - scale));
|
||||
else if (scale > val.scale)
|
||||
valParts[1] = valParts[1].multiply
|
||||
(BigInteger.valueOf (10).pow (scale - val.scale));
|
||||
|
||||
// and compare them
|
||||
return thisParts[1].compareTo (valParts[1]);
|
||||
|
||||
@@ -356,9 +356,9 @@ public class BigInteger extends Number implements Comparable
|
||||
|
||||
public int signum()
|
||||
{
|
||||
int top = words == null ? ival : words[ival-1];
|
||||
if (top == 0 && words == null)
|
||||
if (ival == 0 && words == null)
|
||||
return 0;
|
||||
int top = words == null ? ival : words[ival-1];
|
||||
return top < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
@@ -2227,17 +2227,25 @@ public class BigInteger extends Number implements Comparable
|
||||
throws IOException, ClassNotFoundException
|
||||
{
|
||||
s.defaultReadObject();
|
||||
words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
if (magnitude.length == 0 || signum == 0)
|
||||
{
|
||||
this.ival = 0;
|
||||
this.words = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
}
|
||||
}
|
||||
|
||||
private void writeObject(ObjectOutputStream s)
|
||||
throws IOException, ClassNotFoundException
|
||||
{
|
||||
signum = signum();
|
||||
magnitude = toByteArray();
|
||||
magnitude = signum == 0 ? new byte[0] : toByteArray();
|
||||
s.defaultWriteObject();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user