Don't add the #x marker in flo:->string / number->string.

We'll add it in the printer downstream.

diff --git a/src/runtime/dragon4.scm b/src/runtime/dragon4.scm
index 73c69a9b9ba7fc692170e4826621ac4212ef1d36..28a170cef70b913a59e3b8442dafe1a46c72307e 100644 (file)
--- a/src/runtime/dragon4.scm
+++ b/src/runtime/dragon4.scm
@@ -66,44 +66,44 @@ not much different to numbers within a few orders of magnitude of 1.
   unspecific)
 \f
 (define (flo:->string x radix)
-  (define (x>0 x signify)
-    (let ((p flo:significand-digits-base-2))
-      (call-with-values flonum-printer-cutoff-args
-       (lambda (cutoff-mode cutoff display-procedure)
-         (if (int:= radix #x10)
-             (string-append "#x" (signify (ieee754-binary64-hex-string x "")))
-             (signify
-              (call-with-values (lambda () (dragon4-normalize x p))
-                (lambda (f e)
-                  (dragon4 f e p radix cutoff-mode cutoff
-                    (lambda (u k generate)
-                      (let ((digits
-                             (list->string
-                              (let loop
-                                  ((u u) (k k) (generate generate))
-                                k      ;ignore
-                                (if (negative? u)
-                                    '()
-                                    (cons (digit->char u radix)
-                                          (generate loop)))))))
-                        (display-procedure digits k radix))))))))))))
-  (or (and flonum-printer-hook
-          (flonum-printer-hook x radix))
-      (cond ((flo:nan? x)
-            (string-copy "+nan.0"))
-           ((flo:positive? x)
-            (if (flo:infinite? x)
-                (string-copy "+inf.0")
-                (x>0 x (lambda (s) s))))
-           ((flo:negative? x)
-            (let ((x (flo:negate x)))
+  (let ((x>0
+        (lambda (x)
+          (let ((p flo:significand-digits-base-2))
+            (call-with-values flonum-printer-cutoff-args
+              (lambda (cutoff-mode cutoff display-procedure)
+                (if (int:= radix #x10)
+                    (ieee754-binary64-hex-string x "")
+                    (call-with-values (lambda () (dragon4-normalize x p))
+                      (lambda (f e)
+                        (dragon4 f e p radix cutoff-mode cutoff
+                          (lambda (u k generate)
+                            (let ((digits
+                                   (list->string
+                                    (let loop
+                                        ((u u) (k k) (generate generate))
+                                      k ;ignore
+                                      (if (negative? u)
+                                          '()
+                                          (cons (digit->char u radix)
+                                                (generate loop)))))))
+                              (display-procedure digits k radix)))))))))))))
+    (or (and flonum-printer-hook
+            (flonum-printer-hook x radix))
+       (cond ((flo:nan? x)
+              (string-copy "+nan.0"))
+             ((flo:positive? x)
               (if (flo:infinite? x)
-                  (string-copy "-inf.0")
-                  (x>0 x (lambda (s) (string-append "-" s))))))
-           ((flo:zero? x)
-            (string-copy (if (flo:safe-negative? x) "-0." "0.")))
-           (else
-            (string-copy "+nan.0")))))
+                  (string-copy "+inf.0")
+                  (x>0 x)))
+             ((flo:negative? x)
+              (let ((x (flo:negate x)))
+                (if (flo:infinite? x)
+                    (string-copy "-inf.0")
+                    (string-append "-" (x>0 x)))))
+             ((flo:zero? x)
+              (string-copy (if (flo:safe-negative? x) "-0." "0.")))
+             (else
+              (string-copy "+nan.0"))))))
 
 (define (flonum-printer:normal-output digits k radix)
   (let ((k+1 (+ k 1)))

diff --git a/tests/runtime/test-dragon4.scm b/tests/runtime/test-dragon4.scm
index 83bd9c967a2fc1e08fe8da1acc0c91ae00b46a0a..1890ed0ac94358fdefe9f71b8b1fe7c9e808d8e5 100644 (file)
--- a/tests/runtime/test-dragon4.scm
+++ b/tests/runtime/test-dragon4.scm
@@ -94,9 +94,9 @@ USA.
 (define-hex-tests 'hex
   '(0. "0.")
   '(-0. "-0.")
-  '(1. "#x1p+0")
-  '(-1. "#x-1p+0")
-  '(1.5 "#x1.8p+0")
-  '(-1.5 "#x-1.8p+0")
-  '(15. "#x1.ep+3")
-  '(16. "#x1p+4"))
\ No newline at end of file
+  '(1. "1p+0")
+  '(-1. "-1p+0")
+  '(1.5 "1.8p+0")
+  '(-1.5 "-1.8p+0")
+  '(15. "1.ep+3")
+  '(16. "1p+4"))
\ No newline at end of file