GitLab

at 2026-05-25T07:42:55-07:00

Use the correct exponent marker for ~E and ~G

We were always using d for the ryu printer, but the marker depends on
the type of the number and `*read-default-float-format*`.

 	      (float-nan-p number)))

      (prin1 number stream))

     (t

-     (write-string (lisp::format-e number w d e k ovf pad marker atsign)

+     ;; LISP::FORMAT-E uses a literal #\d as the default exponent

+     ;; marker when EXPONENTCHAR is NIL, but the CL ~E directive

+     ;; chooses the marker based on the value's type and

+     ;; *READ-DEFAULT-FLOAT-FORMAT* (see FORMAT-EXPONENT-MARKER).

+     ;; Resolve the default here so the same rule applies.

+     (write-string (lisp::format-e number w d e k ovf pad

+				   (or marker (format-exponent-marker number))

+				   atsign)

 		   stream)))

   (values))

     (prin1 number stream)

     nil)

    (t

-    (write-string (lisp::format-g number w d e (or k 1) ovf pad marker atsign)

+    (write-string (lisp::format-g number w d e (or k 1) ovf pad

+				  (or marker (format-exponent-marker number))

+				  atsign)

 		  stream)))

   (values))

Raymond Toy pushed to branch rtoy-print-using-ryu at cmucl / cmucl

Commits:

1 changed file:

Changes: