Changeset 12897

Timestamp:

Sep 29, 2009, 8:22:23 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Add DOUBLE-FLOAT-NAN constant; use it in PARSE-FLOAT instead of computing
it (incorrectly) inline. Fixes ticket:502.

File:

• trunk/source/lib/numbers.lisp (modified) (2 diffs)

trunk/source/lib/numbers.lisp

@@ -47 +47 @@
         (ccl:set-fpu-mode :division-by-zero division-by-zero))))
 
-
+(defconstant double-float-nan
+  #.(let ((invalid (get-fpu-mode :invalid)))
+      (unwind-protect
+           (progn
+             (set-fpu-mode :invalid nil)
+             (+ double-float-positive-infinity double-float-negative-infinity))
+        (set-fpu-mode :invalid invalid))))
 
 (defun parse-float (str len off)  
@@ -109 +115 @@
          (nan 
           (return-from parse-float
-            (let* ((invalid (ccl:get-fpu-mode :invalid)))
-            (unwind-protect
-                (progn
-                  (ccl:set-fpu-mode :invalid nil)
-                  (coerce
-                   ;; we could also have used a double-float-nan
-                   ;; variable binding here:
-                   (+ double-float-positive-infinity
-                      double-float-positive-infinity)
-                   type))
-              (ccl:set-fpu-mode :invalid invalid)))))
+            (coerce double-float-nan type)))
          (expt (setq expt (%i+ expt (* esign eexp))))
          (t (return-from parse-float nil)))))