Changeset 12018

Timestamp:

06/16/09 20:46:06 (14 years ago)

Author:

ehuelsmann

Message:

Reconstruct NaNs? upon reading, if readable output is requested.

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

@@ -592 +592 @@
             return sb.toString();
         }
-        if (value != value)
-            return "#<DOUBLE-FLOAT NaN>";
+
+        LispThread thread = LispThread.currentThread();
+        boolean printReadably = Symbol.PRINT_READABLY.symbolValue(thread) != NIL;
+
+        if (value != value) {
+            if (printReadably)
+                return "#.(progn \"Comment: create a NaN.\" (/ 0.0d0 0.0d0))";
+            else
+                return "#<DOUBLE-FLOAT NaN>";
+        }
         String s1 = String.valueOf(value);
-        LispThread thread = LispThread.currentThread();
-        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
+        if (printReadably ||
             !memq(Symbol.READ_DEFAULT_FLOAT_FORMAT.symbolValue(thread),
                   list(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT)))

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

@@ -581 +581 @@
             return sb.toString();
         }
-        if (value != value)
-            return "#<SINGLE-FLOAT NaN>";
+
+        LispThread thread = LispThread.currentThread();
+        boolean printReadably = Symbol.PRINT_READABLY.symbolValue(thread) != NIL;
+
+        if (value != value) {
+            if (printReadably)
+                return "#.(progn \"Comment: create a NaN.\" (/ 0.0s0 0.0s0))";
+            else
+                return "#<SINGLE-FLOAT NaN>";
+        }
         String s1 = String.valueOf(value);
-        LispThread thread = LispThread.currentThread();
-        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
+        if (printReadably ||
             !memq(Symbol.READ_DEFAULT_FLOAT_FORMAT.symbolValue(thread),
                   list(Symbol.SINGLE_FLOAT, Symbol.SHORT_FLOAT)))