Changing printf to use arguments from the stack.
John Benediktsson
parent
53197ddb1b
commit
5885a924fc
|
|
@ -39,23 +39,23 @@ HELP: printf
|
|||
{ $examples
|
||||
{ $example
|
||||
"USING: printf ;"
|
||||
"{ 123 } \"%05d\" printf"
|
||||
"123 \"%05d\" printf"
|
||||
"00123" }
|
||||
{ $example
|
||||
"USING: printf ;"
|
||||
"{ HEX: ff } \"04X\" printf"
|
||||
"HEX: ff \"04X\" printf"
|
||||
"00FF" }
|
||||
{ $example
|
||||
"USING: printf ;"
|
||||
"{ 1.23456789 } \"%.3f\" printf"
|
||||
"1.23456789 \"%.3f\" printf"
|
||||
"1.234" }
|
||||
{ $example
|
||||
"USING: printf ;"
|
||||
"{ 1234567890 } \"%.5e\" printf"
|
||||
"1234567890 \"%.5e\" printf"
|
||||
"1.23456e+09" }
|
||||
{ $example
|
||||
"USING: printf ;"
|
||||
"{ 12 } \"%'#4d\" printf"
|
||||
"12 \"%'#4d\" printf"
|
||||
"##12" }
|
||||
} ;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,96 +5,96 @@ USING: kernel printf tools.test ;
|
|||
|
||||
[ "%s" printf ] must-infer
|
||||
|
||||
[ t ] [ "10" { 10 } "%d" sprintf = ] unit-test
|
||||
[ t ] [ "10" 10 "%d" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "123.456" { 123.456 } "%f" sprintf = ] unit-test
|
||||
[ t ] [ "123.456" 123.456 "%f" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "123.10" { 123.1 } "%01.2f" sprintf = ] unit-test
|
||||
[ t ] [ "123.10" 123.1 "%01.2f" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "1.2345" { 1.23456789 } "%.4f" sprintf = ] unit-test
|
||||
[ t ] [ "1.2345" 1.23456789 "%.4f" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " 1.23" { 1.23456789 } "%6.2f" sprintf = ] unit-test
|
||||
[ t ] [ " 1.23" 1.23456789 "%6.2f" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "1.234e+08" { 123400000 } "%e" sprintf = ] unit-test
|
||||
[ t ] [ "1.234e+08" 123400000 "%e" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "1.234567e+08" { 123456700 } "%e" sprintf = ] unit-test
|
||||
[ t ] [ "1.234567e+08" 123456700 "%e" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "3.625e+08" { 362525200 } "%.3e" sprintf = ] unit-test
|
||||
[ t ] [ "3.625e+08" 362525200 "%.3e" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "2.5e-03" { 0.0025 } "%e" sprintf = ] unit-test
|
||||
[ t ] [ "2.5e-03" 0.0025 "%e" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "2.5E-03" { 0.0025 } "%E" sprintf = ] unit-test
|
||||
[ t ] [ "2.5E-03" 0.0025 "%E" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "ff" { HEX: ff } "%x" sprintf = ] unit-test
|
||||
[ t ] [ "ff" HEX: ff "%x" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "FF" { HEX: ff } "%X" sprintf = ] unit-test
|
||||
[ t ] [ "FF" HEX: ff "%X" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "0f" { HEX: f } "%02x" sprintf = ] unit-test
|
||||
[ t ] [ "0f" HEX: f "%02x" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "0F" { HEX: f } "%02X" sprintf = ] unit-test
|
||||
[ t ] [ "0F" HEX: f "%02X" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "2008-09-10"
|
||||
{ 2008 9 10 } "%04d-%02d-%02d" sprintf = ] unit-test
|
||||
2008 9 10 "%04d-%02d-%02d" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "Hello, World!"
|
||||
{ "Hello, World!" } "%s" sprintf = ] unit-test
|
||||
"Hello, World!" "%s" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "printf test"
|
||||
{ } "printf test" sprintf = ] unit-test
|
||||
"printf test" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "char a = 'a'"
|
||||
{ CHAR: a } "char %c = 'a'" sprintf = ] unit-test
|
||||
CHAR: a "char %c = 'a'" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "00" { HEX: 0 } "%02x" sprintf = ] unit-test
|
||||
[ t ] [ "00" HEX: 0 "%02x" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "ff" { HEX: ff } "%02x" sprintf = ] unit-test
|
||||
[ t ] [ "ff" HEX: ff "%02x" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "0 message(s)"
|
||||
{ 0 "message" } "%d %s(s)%" sprintf = ] unit-test
|
||||
0 "message" "%d %s(s)" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "0 message(s) with %"
|
||||
{ 0 "message" } "%d %s(s) with %%" sprintf = ] unit-test
|
||||
0 "message" "%d %s(s) with %%" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "justif: \"left \""
|
||||
{ "left" } "justif: \"%-10s\"" sprintf = ] unit-test
|
||||
"left" "justif: \"%-10s\"" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "justif: \" right\""
|
||||
{ "right" } "justif: \"%10s\"" sprintf = ] unit-test
|
||||
"right" "justif: \"%10s\"" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " 3: 0003 zero padded"
|
||||
{ 3 } " 3: %04d zero padded" sprintf = ] unit-test
|
||||
3 " 3: %04d zero padded" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " 3: 3 left justif"
|
||||
{ 3 } " 3: %-4d left justif" sprintf = ] unit-test
|
||||
3 " 3: %-4d left justif" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " 3: 3 right justif"
|
||||
{ 3 } " 3: %4d right justif" sprintf = ] unit-test
|
||||
3 " 3: %4d right justif" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " -3: -003 zero padded"
|
||||
{ -3 } " -3: %04d zero padded" sprintf = ] unit-test
|
||||
-3 " -3: %04d zero padded" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " -3: -3 left justif"
|
||||
{ -3 } " -3: %-4d left justif" sprintf = ] unit-test
|
||||
-3 " -3: %-4d left justif" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ " -3: -3 right justif"
|
||||
{ -3 } " -3: %4d right justif" sprintf = ] unit-test
|
||||
-3 " -3: %4d right justif" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "There are 10 monkeys in the kitchen"
|
||||
{ 10 "kitchen" } "There are %d monkeys in the %s" sprintf = ] unit-test
|
||||
10 "kitchen" "There are %d monkeys in the %s" sprintf = ] unit-test
|
||||
|
||||
[ f ] [ "%d" { 10 } "%d" sprintf = ] unit-test
|
||||
[ f ] [ "%d" 10 "%d" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[monkey]" { "monkey" } "[%s]" sprintf = ] unit-test
|
||||
[ t ] [ "[monkey]" "monkey" "[%s]" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[ monkey]" { "monkey" } "[%10s]" sprintf = ] unit-test
|
||||
[ t ] [ "[ monkey]" "monkey" "[%10s]" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[monkey ]" { "monkey" } "[%-10s]" sprintf = ] unit-test
|
||||
[ t ] [ "[monkey ]" "monkey" "[%-10s]" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[0000monkey]" { "monkey" } "[%010s]" sprintf = ] unit-test
|
||||
[ t ] [ "[0000monkey]" "monkey" "[%010s]" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[####monkey]" { "monkey" } "[%'#10s]" sprintf = ] unit-test
|
||||
[ t ] [ "[####monkey]" "monkey" "[%'#10s]" sprintf = ] unit-test
|
||||
|
||||
[ t ] [ "[many monke]" { "many monkeys" } "[%10.10s]" sprintf = ] unit-test
|
||||
[ t ] [ "[many monke]" "many monkeys" "[%10.10s]" sprintf = ] unit-test
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
! See http://factorcode.org/license.txt for BSD license
|
||||
|
||||
USING: io io.encodings.ascii io.files io.streams.string
|
||||
kernel sequences splitting strings vectors math math.parser macros
|
||||
fry peg.ebnf unicode.case arrays prettyprint quotations ;
|
||||
kernel sequences splitting strings math math.parser macros
|
||||
fry peg.ebnf unicode.case arrays quotations vectors ;
|
||||
|
||||
IN: printf
|
||||
|
||||
|
|
@ -12,12 +12,6 @@ IN: printf
|
|||
: compose-all ( seq -- quot )
|
||||
[ ] [ compose ] reduce ;
|
||||
|
||||
: write-all ( seq -- quot )
|
||||
[ [ write ] append ] map ;
|
||||
|
||||
: apply-format ( params quot -- params string )
|
||||
[ dup pop ] dip call ; inline
|
||||
|
||||
: fix-neg ( string -- string )
|
||||
dup CHAR: 0 swap index 0 =
|
||||
[ dup CHAR: - swap index dup
|
||||
|
|
@ -47,61 +41,55 @@ IN: printf
|
|||
|
||||
EBNF: parse-format-string
|
||||
|
||||
plain-text = (!("%").)+ => [[ >string 1quotation ]]
|
||||
zero = "0" => [[ CHAR: 0 ]]
|
||||
char = "'" (.) => [[ second ]]
|
||||
|
||||
percents = "%" => [[ '[ "%" ] ]]
|
||||
|
||||
pad-zero = "0" => [[ CHAR: 0 ]]
|
||||
pad-char = "'" (.) => [[ second ]]
|
||||
pad-char_ = (pad-zero|pad-char)? => [[ CHAR: \s or 1quotation ]]
|
||||
pad-char = (zero|char)? => [[ CHAR: \s or 1quotation ]]
|
||||
pad-align = ("-")? => [[ [ [ pad-right ] ] [ [ pad-left ] ] if ]]
|
||||
pad-width = ([0-9])* => [[ >digits 1quotation ]]
|
||||
pad = pad-align pad-char_ pad-width => [[ reverse compose-all ]]
|
||||
pad = pad-align pad-char pad-width => [[ reverse compose-all [ first ] keep swap 0 = [ drop [ ] ] when ]]
|
||||
|
||||
width = "." ([0-9])* => [[ second >digits '[ _ max-width ] ]]
|
||||
width_ = (width)? => [[ [ ] or ]]
|
||||
width_ = "." ([0-9])* => [[ second >digits '[ _ max-width ] ]]
|
||||
width = (width_)? => [[ [ ] or ]]
|
||||
|
||||
digits = "." ([0-9])* => [[ second >digits '[ _ max-digits ] ]]
|
||||
digits_ = (digits)? => [[ [ ] or ]]
|
||||
digits_ = "." ([0-9])* => [[ second >digits '[ _ max-digits ] ]]
|
||||
digits = (digits_)? => [[ [ ] or ]]
|
||||
|
||||
fmt-% = "%" => [[ [ "%" ] ]]
|
||||
fmt-c = "c" => [[ [ 1string ] ]]
|
||||
fmt-C = "C" => [[ [ 1string >upper ] ]]
|
||||
chars = (fmt-c | fmt-C) => [[ '[ _ apply-format ] ]]
|
||||
|
||||
fmt-s = "s" => [[ [ ] ]]
|
||||
fmt-S = "S" => [[ [ >upper ] ]]
|
||||
strings = pad width_ (fmt-s | fmt-S) => [[ reverse compose-all '[ _ apply-format ] ]]
|
||||
|
||||
fmt-d = "d" => [[ [ >fixnum number>string ] ]]
|
||||
decimals = fmt-d
|
||||
|
||||
fmt-e = "e" => [[ [ >exponential ] ]]
|
||||
fmt-E = "E" => [[ [ >exponential >upper ] ]]
|
||||
exps = digits_ (fmt-e | fmt-E) => [[ reverse [ swap ] join [ swap append ] append ]]
|
||||
|
||||
fmt-f = "f" => [[ [ >float number>string ] ]]
|
||||
floats = digits_ fmt-f => [[ reverse compose-all ]]
|
||||
|
||||
fmt-x = "x" => [[ [ >hex ] ]]
|
||||
fmt-X = "X" => [[ [ >hex >upper ] ]]
|
||||
unknown = (.)* => [[ "Unknown directive" throw ]]
|
||||
|
||||
chars = fmt-c | fmt-C
|
||||
strings = pad width (fmt-s|fmt-S) => [[ reverse compose-all ]]
|
||||
decimals = fmt-d
|
||||
exps = digits (fmt-e|fmt-E) => [[ reverse [ swap ] join [ swap append ] append ]]
|
||||
floats = digits fmt-f => [[ reverse compose-all ]]
|
||||
hex = fmt-x | fmt-X
|
||||
numbers = pad (decimals|floats|hex|exps) => [[ reverse compose-all [ fix-neg ] append ]]
|
||||
|
||||
numbers = (pad) (decimals|floats|hex|exps) => [[ reverse compose-all [ fix-neg ] append '[ _ apply-format ] ]]
|
||||
formats = "%" (chars|strings|numbers|fmt-%|unknown) => [[ second '[ _ dip ] ]]
|
||||
|
||||
formats = "%" (chars|strings|numbers|percents) => [[ second ]]
|
||||
plain-text = (!("%").)+ => [[ >string '[ _ swap ] ]]
|
||||
|
||||
text = (formats|plain-text)* => [[ write-all compose-all ]]
|
||||
text = (formats|plain-text)* => [[ reverse [ [ dup [ push ] dip ] append ] map ]]
|
||||
|
||||
;EBNF
|
||||
|
||||
PRIVATE>
|
||||
|
||||
MACRO: printf ( format-string -- )
|
||||
parse-format-string '[ reverse >vector @ drop ] ;
|
||||
parse-format-string [ length ] keep compose-all '[ _ <vector> @ reverse [ write ] each ] ;
|
||||
|
||||
: sprintf ( params format-string -- result )
|
||||
: sprintf ( format-string -- )
|
||||
[ printf ] with-string-writer ;
|
||||
|
||||
: fprintf ( filename params format-string -- )
|
||||
rot ascii [ printf ] with-file-appender ;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue