steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing printf to use arguments from the stack.

db4
John Benediktsson 2008-09-17 19:59:22 -07:00
parent 53197ddb1b
commit 5885a924fc
3 changed files with 67 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/printf/printf-docs.factor
View File

@ -39,23 +39,23 @@ HELP: printf
{ $examples { $examples
{ $example { $example
"USING: printf ;" "USING: printf ;"
"{ 123 } \"%05d\" printf" "123 \"%05d\" printf"
"00123" } "00123" }
{ $example { $example
"USING: printf ;" "USING: printf ;"
"{ HEX: ff } \"04X\" printf" "HEX: ff \"04X\" printf"
"00FF" } "00FF" }
{ $example { $example
"USING: printf ;" "USING: printf ;"
"{ 1.23456789 } \"%.3f\" printf" "1.23456789 \"%.3f\" printf"
"1.234" } "1.234" }
{ $example { $example
"USING: printf ;" "USING: printf ;"
"{ 1234567890 } \"%.5e\" printf" "1234567890 \"%.5e\" printf"
"1.23456e+09" } "1.23456e+09" }
{ $example { $example
"USING: printf ;" "USING: printf ;"
"{ 12 } \"%'#4d\" printf" "12 \"%'#4d\" printf"
"##12" } "##12" }
} ; } ;

76
extra/printf/printf-tests.factor
View File

@ -5,96 +5,96 @@ USING: kernel printf tools.test ;
[ "%s" printf ] must-infer [ "%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" [ 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!" [ t ] [ "Hello, World!"
{ "Hello, World!" } "%s" sprintf = ] unit-test "Hello, World!" "%s" sprintf = ] unit-test
[ t ] [ "printf test" [ t ] [ "printf test"
{ } "printf test" sprintf = ] unit-test "printf test" sprintf = ] unit-test
[ t ] [ "char a = 'a'" [ 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)" [ 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 %" [ 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 \"" [ t ] [ "justif: \"left \""
{ "left" } "justif: \"%-10s\"" sprintf = ] unit-test "left" "justif: \"%-10s\"" sprintf = ] unit-test
[ t ] [ "justif: \" right\"" [ t ] [ "justif: \" right\""
{ "right" } "justif: \"%10s\"" sprintf = ] unit-test "right" "justif: \"%10s\"" sprintf = ] unit-test
[ t ] [ " 3: 0003 zero padded" [ 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" [ 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" [ 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" [ 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" [ 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" [ 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" [ 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

60
extra/printf/printf.factor
View File

@ -2,8 +2,8 @@
! See http://factorcode.org/license.txt for BSD license ! See http://factorcode.org/license.txt for BSD license
USING: io io.encodings.ascii io.files io.streams.string USING: io io.encodings.ascii io.files io.streams.string
kernel sequences splitting strings vectors math math.parser macros kernel sequences splitting strings math math.parser macros
fry peg.ebnf unicode.case arrays prettyprint quotations ; fry peg.ebnf unicode.case arrays quotations vectors ;
IN: printf IN: printf
@ -12,12 +12,6 @@ IN: printf
: compose-all ( seq -- quot ) : compose-all ( seq -- quot )
[ ] [ compose ] reduce ; [ ] [ compose ] reduce ;
: write-all ( seq -- quot )
[ [ write ] append ] map ;
: apply-format ( params quot -- params string )
[ dup pop ] dip call ; inline
: fix-neg ( string -- string ) : fix-neg ( string -- string )
dup CHAR: 0 swap index 0 = dup CHAR: 0 swap index 0 =
[ dup CHAR: - swap index dup [ dup CHAR: - swap index dup
@ -47,61 +41,55 @@ IN: printf
EBNF: parse-format-string EBNF: parse-format-string
plain-text = (!("%").)+ => [[ >string 1quotation ]] zero = "0" => [[ CHAR: 0 ]]
char = "'" (.) => [[ second ]]
percents = "%" => [[ '[ "%" ] ]] pad-char = (zero|char)? => [[ CHAR: \s or 1quotation ]]
pad-zero = "0" => [[ CHAR: 0 ]]
pad-char = "'" (.) => [[ second ]]
pad-char_ = (pad-zero|pad-char)? => [[ CHAR: \s or 1quotation ]]
pad-align = ("-")? => [[ [ [ pad-right ] ] [ [ pad-left ] ] if ]] pad-align = ("-")? => [[ [ [ pad-right ] ] [ [ pad-left ] ] if ]]
pad-width = ([0-9])* => [[ >digits 1quotation ]] 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_ = "." ([0-9])* => [[ second >digits '[ _ max-width ] ]]
width_ = (width)? => [[ [ ] or ]] width = (width_)? => [[ [ ] or ]]
digits = "." ([0-9])* => [[ second >digits '[ _ max-digits ] ]] digits_ = "." ([0-9])* => [[ second >digits '[ _ max-digits ] ]]
digits_ = (digits)? => [[ [ ] or ]] digits = (digits_)? => [[ [ ] or ]]
fmt-% = "%" => [[ [ "%" ] ]]
fmt-c = "c" => [[ [ 1string ] ]] fmt-c = "c" => [[ [ 1string ] ]]
fmt-C = "C" => [[ [ 1string >upper ] ]] fmt-C = "C" => [[ [ 1string >upper ] ]]
chars = (fmt-c | fmt-C) => [[ '[ _ apply-format ] ]]
fmt-s = "s" => [[ [ ] ]] fmt-s = "s" => [[ [ ] ]]
fmt-S = "S" => [[ [ >upper ] ]] fmt-S = "S" => [[ [ >upper ] ]]
strings = pad width_ (fmt-s | fmt-S) => [[ reverse compose-all '[ _ apply-format ] ]]
fmt-d = "d" => [[ [ >fixnum number>string ] ]] fmt-d = "d" => [[ [ >fixnum number>string ] ]]
decimals = fmt-d
fmt-e = "e" => [[ [ >exponential ] ]] fmt-e = "e" => [[ [ >exponential ] ]]
fmt-E = "E" => [[ [ >exponential >upper ] ]] fmt-E = "E" => [[ [ >exponential >upper ] ]]
exps = digits_ (fmt-e | fmt-E) => [[ reverse [ swap ] join [ swap append ] append ]]
fmt-f = "f" => [[ [ >float number>string ] ]] fmt-f = "f" => [[ [ >float number>string ] ]]
floats = digits_ fmt-f => [[ reverse compose-all ]]
fmt-x = "x" => [[ [ >hex ] ]] fmt-x = "x" => [[ [ >hex ] ]]
fmt-X = "X" => [[ [ >hex >upper ] ]] 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 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 ;EBNF
PRIVATE> PRIVATE>
MACRO: printf ( format-string -- ) 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 ; [ printf ] with-string-writer ;
: fprintf ( filename params format-string -- )
rot ascii [ printf ] with-file-appender ;