Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 13:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating sign-rule to respect finalized SRFI 159

Browse source
This commit is contained in:
Alex Shinn 2019-03-10 14:50:44 +08:00
parent e921fdb95c
commit bd78ebeed7
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/chibi/show-test.sld
View file

@ -221,6 +221,9 @@
;; sign ;; sign
(test "+1" (show #f (numeric 1 10 #f #t))) (test "+1" (show #f (numeric 1 10 #f #t)))
(test "+1" (show #f (with ((sign-rule #t)) (numeric 1)))) (test "+1" (show #f (with ((sign-rule #t)) (numeric 1))))
(test "(1)" (show #f (with ((sign-rule '("(" . ")"))) (numeric -1))))
(test "-1" (show #f (with ((sign-rule '("-" . ""))) (numeric -1))))
(test "−1" (show #f (with ((sign-rule '("−" . ""))) (numeric -1))))
(test "-0.0" (show #f (with ((sign-rule #t)) (numeric -0.0)))) (test "-0.0" (show #f (with ((sign-rule #t)) (numeric -0.0))))
(test "+0.0" (show #f (with ((sign-rule #t)) (numeric +0.0)))) (test "+0.0" (show #f (with ((sign-rule #t)) (numeric +0.0))))

16
lib/chibi/show/write.scm
View file

@ -303,11 +303,17 @@
(define (wrap-sign n sign-rule) (define (wrap-sign n sign-rule)
(cond (cond
((negative?* n) ((negative?* n)
(if (char? sign-rule) (cond
(string-append (string sign-rule) ((char? sign-rule)
(wrap-comma (- n)) (string-append (string sign-rule)
(string (char-mirror sign-rule))) (wrap-comma (- n))
(string-append "-" (wrap-comma (- n))))) (string (char-mirror sign-rule))))
((pair? sign-rule)
(string-append (car sign-rule)
(wrap-comma (- n))
(cdr sign-rule)))
(else
(string-append "-" (wrap-comma (- n))))))
((eq? #t sign-rule) ((eq? #t sign-rule)
(string-append "+" (wrap-comma n))) (string-append "+" (wrap-comma n)))
(else (else