Changeset 12535

Timestamp:

03/14/10 19:17:37 (13 years ago)

Author:

ehuelsmann

Message:

Fix returned values from SingleFloat?.getInstance() and
DoubleFloat?.getInstance() for -0.0; -0.0 == 0.0.

Patch by: Douglas Miles (dmiles at users dot sf dot net)

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• DoubleFloat.java (modified) (1 diff)
• SingleFloat.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java

@@ -57 +57 @@
 
     public static DoubleFloat getInstance(double d) {
-        if (d == 0)
-            return ZERO;
-        else if (d == -0.0d )
-            return MINUS_ZERO;
+        if (d == 0) {
+            long bits = Double.doubleToRawLongBits(d);
+            if (bits < 0)
+                return MINUS_ZERO;
+            else
+                return ZERO;
+        }
         else if (d == 1)
             return ONE;

trunk/abcl/src/org/armedbear/lisp/SingleFloat.java

@@ -57 +57 @@
 
     public static SingleFloat getInstance(float f) {
-        if (f == 0)
-            return ZERO;
-        else if (f == -0.0f )
-            return MINUS_ZERO;
+        if (f == 0) {
+            int bits = Float.floatToRawIntBits(f);
+            if (bits < 0)
+                return MINUS_ZERO;
+            else
+                return ZERO;
+        }
         else if (f == 1)
             return ONE;