Changeset 10626

Timestamp:

02/02/05 17:58:47 (4 years ago)

Author:

rtoy

Message:

Fix some floating point printing bugs. Based on the version in sbcl.

(format nil "~G" 1d23) prints "100000000000000000000000. " instead
of "099999999999999990000000. ".

Location:

trunk/src/code

Files:

• format.lisp (modified) (1 diff)
• print.lisp (modified) (3 diffs)

trunk/src/code/format.lisp

@@ -2075 +2075 @@
                           (*outside-args* args))
                      (catch 'up-and-out
-                       (do-guts arg arg)
-                       args))
+                       (do-guts arg arg))
+                     args)
                    (do-guts orig-args args)))
              (do-loop (orig-args args)

trunk/src/code/print.lisp

@@ -283 +283 @@
            (pprint-logical-block (stream nil :prefix "#<" :suffix ">")
              (print-description)))
+          ((and *print-level* (>= *current-level* *print-level*))
+           (write-char #\# stream))
           (t
            (write-string "#<" stream)
@@ -1001 +1003 @@
 |#
 
+
+(defun array-readably-printable-p (array)
+  (and (eq (array-element-type array) t)
+       (let ((zero (position 0 (array-dimensions array)))
+             (number (position 0 (array-dimensions array)
+                               :test (complement #'eql)
+                               :from-end t)))
+         (or (null zero) (null number) (> zero number)))))
+
+
 ;;;; Recursive objects.
 
@@ -1040 +1052 @@
              (1 (write-char #\1 stream)))))
         ((and *print-readably*
-              (not (eq (array-element-type vector) 't)))
+              (not (array-readably-printable-p vector)))
          (output-array vector stream))
         (t