Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-16 17:37:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch /si default base to 1000, remove show-columns export

Browse source
This commit is contained in:
Alex Shinn 2020-06-24 13:08:33 +09:00
parent 532fb83e0a
commit 25e04e2a35
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/srfi/166.sld
View file

@ -24,7 +24,7 @@
pretty pretty-shared pretty-simply pretty-with-color pretty pretty-shared pretty-simply pretty-with-color
;; columnar ;; columnar
columnar tabular wrapped wrapped/list wrapped/char columnar tabular wrapped wrapped/list wrapped/char
justified from-file line-numbers show-columns justified from-file line-numbers
;; unicode ;; unicode
as-unicode unicode-terminal-width unicode-terminal-width/wide as-unicode unicode-terminal-width unicode-terminal-width/wide
upcased downcased upcased downcased

2
lib/srfi/166/columnar.sld
View file

@ -10,5 +10,5 @@
(chibi optional)) (chibi optional))
(export (export
columnar tabular wrapped wrapped/list wrapped/char columnar tabular wrapped wrapped/list wrapped/char
justified from-file line-numbers show-columns) justified from-file line-numbers)
(include "column.scm")) (include "column.scm"))

23
lib/srfi/166/test.sld
View file

@ -261,7 +261,8 @@
(test "608" (show #f (numeric/si 608))) (test "608" (show #f (numeric/si 608)))
(test "608 B" (show #f (numeric/si 608 1000 " ") "B")) (test "608 B" (show #f (numeric/si 608 1000 " ") "B"))
(test "3.9Ki" (show #f (numeric/si 3986))) (test "4k" (show #f (numeric/si 3986)))
(test "3.9Ki" (show #f (numeric/si 3986 1024)))
(test "4kB" (show #f (numeric/si 3986 1000) "B")) (test "4kB" (show #f (numeric/si 3986 1000) "B"))
(test "1.2Mm" (show #f (numeric/si 1.23e6 1000) "m")) (test "1.2Mm" (show #f (numeric/si 1.23e6 1000) "m"))
(test "123km" (show #f (numeric/si 1.23e5 1000) "m")) (test "123km" (show #f (numeric/si 1.23e5 1000) "m"))
@ -574,33 +575,33 @@
;; columns ;; columns
(test "abc\ndef\n" '(test "abc\ndef\n"
(show #f (show-columns (list displayed "abc\ndef\n")))) (show #f (show-columns (list displayed "abc\ndef\n"))))
(test "abc123\ndef456\n" '(test "abc123\ndef456\n"
(show #f (show-columns (list displayed "abc\ndef\n") (show #f (show-columns (list displayed "abc\ndef\n")
(list displayed "123\n456\n")))) (list displayed "123\n456\n"))))
(test "abc123\ndef456\n" '(test "abc123\ndef456\n"
(show #f (show-columns (list displayed "abc\ndef\n") (show #f (show-columns (list displayed "abc\ndef\n")
(list displayed "123\n456")))) (list displayed "123\n456"))))
(test "abc123\ndef456\n" '(test "abc123\ndef456\n"
(show #f (show-columns (list displayed "abc\ndef") (show #f (show-columns (list displayed "abc\ndef")
(list displayed "123\n456\n")))) (list displayed "123\n456\n"))))
(test "abc123\ndef456\nghi789\n" '(test "abc123\ndef456\nghi789\n"
(show #f (show-columns (list displayed "abc\ndef\nghi\n") (show #f (show-columns (list displayed "abc\ndef\nghi\n")
(list displayed "123\n456\n789\n")))) (list displayed "123\n456\n789\n"))))
(test "abc123wuv\ndef456xyz\n" '(test "abc123wuv\ndef456xyz\n"
(show #f (show-columns (list displayed "abc\ndef\n") (show #f (show-columns (list displayed "abc\ndef\n")
(list displayed "123\n456\n") (list displayed "123\n456\n")
(list displayed "wuv\nxyz\n")))) (list displayed "wuv\nxyz\n"))))
(test "abc 123\ndef 456\n" '(test "abc 123\ndef 456\n"
(show #f (show-columns (list (lambda (x) (padded/right 5 x)) (show #f (show-columns (list (lambda (x) (padded/right 5 x))
"abc\ndef\n") "abc\ndef\n")
(list displayed "123\n456\n")))) (list displayed "123\n456\n"))))
(test "ABC 123\nDEF 456\n" '(test "ABC 123\nDEF 456\n"
(show #f (show-columns (list (lambda (x) (upcased (padded/right 5 x))) (show #f (show-columns (list (lambda (x) (upcased (padded/right 5 x)))
"abc\ndef\n") "abc\ndef\n")
(list displayed "123\n456\n")))) (list displayed "123\n456\n"))))
(test "ABC 123\nDEF 456\n" '(test "ABC 123\nDEF 456\n"
(show #f (show-columns (list (lambda (x) (padded/right 5 (upcased x))) (show #f (show-columns (list (lambda (x) (padded/right 5 (upcased x)))
"abc\ndef\n") "abc\ndef\n")
(list displayed "123\n456\n")))) (list displayed "123\n456\n"))))
@ -649,7 +650,7 @@ equivalent to REVERSE.
(lp (cdr ls) (lp (cdr ls)
(kons (car ls) acc))))))))) (kons (car ls) acc)))))))))
(test '(test
"(define (fold kons knil ls) ; The fundamental list iterator. "(define (fold kons knil ls) ; The fundamental list iterator.
(let lp ((ls ls) (acc knil)) ; Applies KONS to each element of (let lp ((ls ls) (acc knil)) ; Applies KONS to each element of
(if (null? ls) ; LS and the result of the previous (if (null? ls) ; LS and the result of the previous

2
lib/srfi/166/write.scm
View file

@ -363,7 +363,7 @@
(define (round-to n k) (define (round-to n k)
(/ (round (* n k)) k)) (/ (round (* n k)) k))
(lambda (n . o) (lambda (n . o)
(let-optionals* o ((base 1024) (let-optionals* o ((base 1000)
(separator "")) (separator ""))
(let* ((log-n (log n)) (let* ((log-n (log n))
(names (if (negative? log-n) (names (if (negative? log-n)