update Java version

Author: peteroupc

src/main/java/com/upokecenter/numbers/EDecimal.java

@@ -774,7 +774,7 @@ public static EDecimal FromDoubleBits(long dblBits) {
         lvalue = ((value[0] & 0xffffffffL) | ((long)value[1] << 32));
         int flags = (neg ? BigNumberFlags.FlagNegative : 0) | (quiet ?
             BigNumberFlags.FlagQuietNaN : BigNumberFlags.FlagSignalingNaN);
-        return lvalue == 0 ? (quiet ? NaN : SignalingNaN) :
+        return (lvalue == 0 && !neg) ? (quiet ? NaN : SignalingNaN) :
           new EDecimal(
             FastIntegerFixed.FromInt64(lvalue),
             FastIntegerFixed.Zero,
@@ -1041,7 +1041,7 @@ public static EDecimal FromSingleBits(int value) {
         value = (neg ? BigNumberFlags.FlagNegative : 0) |
           (quiet ? BigNumberFlags.FlagQuietNaN :
             BigNumberFlags.FlagSignalingNaN);
-        return valueFpMantissa == 0 ? (quiet ? NaN : SignalingNaN) :
+        return (valueFpMantissa == 0 && !neg) ? (quiet ? NaN : SignalingNaN) :
           new EDecimal(
             FastIntegerFixed.FromInt32(valueFpMantissa),
             FastIntegerFixed.Zero,

src/main/java/com/upokecenter/numbers/EFloat.java

@@ -540,7 +540,7 @@ public static EFloat FromDoubleBits(long dblBits) {
         // Treat high bit of mantissa as quiet/signaling bit
         boolean quiet = ((dblBits >> 32) & 0x80000) != 0;
         lvalue = dblBits & ((1L << 51) - 1);
-        if (lvalue == 0) {
+        if (lvalue == 0 && !neg) {
           return quiet ? NaN : SignalingNaN;
         }
         int flags = (neg ? BigNumberFlags.FlagNegative : 0) |
@@ -634,7 +634,7 @@ public static EFloat FromSingleBits(int value) {
         bigmant = EInteger.FromInt32(valueFpMantissa);
         value = (neg ? BigNumberFlags.FlagNegative : 0) | (quiet ?
             BigNumberFlags.FlagQuietNaN : BigNumberFlags.FlagSignalingNaN);
-        if (bigmant.isZero()) {
+        if (bigmant.isZero() && !neg) {
           return quiet ? NaN : SignalingNaN;
         }
         return CreateWithFlags(

src/test/java/com/upokecenter/test/EDecimalTest.java

@@ -273,6 +273,38 @@ public void TestCompareToBinary() {
       }
     }
 
+    @Test
+    public void TestFromSingleBitsNaN() {
+      int bits = ((int)0xffc00000);
+      Assert.assertEquals(bits, EDecimal.FromSingleBits(bits).ToSingleBits());
+      bits = 0x7fc00000;
+      Assert.assertEquals(bits, EDecimal.FromSingleBits(bits).ToSingleBits());
+      bits = ((int)0xffc00000);
+      Assert.assertEquals(bits, EFloat.FromSingleBits(bits).ToSingleBits());
+      bits = 0x7fc00000;
+      Assert.assertEquals(bits, EFloat.FromSingleBits(bits).ToSingleBits());
+      bits = ((int)0xffc00000);
+      Assert.assertEquals(bits, ERational.FromSingleBits(bits).ToSingleBits());
+      bits = 0x7fc00000;
+      Assert.assertEquals(bits, ERational.FromSingleBits(bits).ToSingleBits());
+    }
+
+    @Test
+    public void TestFromDoubleBitsNaN() {
+      long lbits = ((long)0xfff8000000000000);
+      Assert.assertEquals(lbits, EDecimal.FromDoubleBits(lbits).ToDoubleBits());
+      lbits = 0x7ff8000000000000L;
+      Assert.assertEquals(lbits, EDecimal.FromDoubleBits(lbits).ToDoubleBits());
+      lbits = ((long)0xfff8000000000000);
+      Assert.assertEquals(lbits, EFloat.FromDoubleBits(lbits).ToDoubleBits());
+      lbits = 0x7ff8000000000000L;
+      Assert.assertEquals(lbits, EFloat.FromDoubleBits(lbits).ToDoubleBits());
+      lbits = ((long)0xfff8000000000000);
+      Assert.assertEquals(lbits, ERational.FromDoubleBits(lbits).ToDoubleBits());
+      lbits = 0x7ff8000000000000L;
+      Assert.assertEquals(lbits, ERational.FromDoubleBits(lbits).ToDoubleBits());
+    }
+
     @Test
     public void TestCompareToBinarySpecific1A() {
       EFloat ef;

src/test/java/com/upokecenter/test/EFloatTest.java

@@ -933,7 +933,7 @@ public static void TestParseNumberFxxLine(String line) {
         Assert.fail(line);
       }
       String f64 = line.substring(4 + 1 + 8 + 1, (4 + 1 + 8 + 1)+(16));
-      if (line.charAt(4+1+8 + 17) != ' ') {
+      if (line.charAt(4 + 26) != ' ') {
         Assert.fail(line);
       }
       String str = line.substring(4 + 1 + 8 + 1 + 16 + 1);