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

formatting: some cleanup, minor performance improvements.

db4
John Benediktsson 2012-07-20 09:40:30 -07:00
parent 5afca2989c
commit fa0a0939f9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basis/formatting/formatting.factor
View File

@ -11,7 +11,7 @@ IN: formatting
<PRIVATE <PRIVATE
: compose-all ( seq -- quot ) : compose-all ( seq -- quot )
[ ] [ compose ] reduce ; [ ] [ compose ] reduce ; inline
: fix-sign ( string -- string ) : fix-sign ( string -- string )
dup CHAR: 0 swap index 0 = dup CHAR: 0 swap index 0 =
@ -46,7 +46,7 @@ char = "'" (.) => [[ second ]]
pad-char = (zero|char)? => [[ CHAR: \s or ]] pad-char = (zero|char)? => [[ CHAR: \s or ]]
pad-align = ("-")? => [[ \ pad-tail \ pad-head ? ]] pad-align = ("-")? => [[ \ pad-tail \ pad-head ? ]]
pad-width = ([0-9])* => [[ >digits ]] pad-width = ([0-9])* => [[ >digits ]]
pad = pad-align pad-char pad-width => [[ reverse >quotation dup first 0 = [ drop [ ] ] when ]] pad = pad-align pad-char pad-width => [[ <reversed> >quotation dup first 0 = [ drop [ ] ] when ]]
sign = ("+")? => [[ [ dup CHAR: - swap index [ "+" prepend ] unless ] [ ] ? ]] sign = ("+")? => [[ [ dup CHAR: - swap index [ "+" prepend ] unless ] [ ] ? ]]
@ -70,7 +70,7 @@ fmt-X = "X" => [[ [ >hex >upper ] ]]
unknown = (.)* => [[ unknown-printf-directive ]] unknown = (.)* => [[ unknown-printf-directive ]]
strings_ = fmt-c|fmt-C|fmt-s|fmt-S strings_ = fmt-c|fmt-C|fmt-s|fmt-S
strings = pad width strings_ => [[ reverse compose-all ]] strings = pad width strings_ => [[ <reversed> compose-all ]]
numbers_ = fmt-d|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X numbers_ = fmt-d|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
numbers = sign pad numbers_ => [[ unclip-last prefix compose-all [ fix-sign ] append ]] numbers = sign pad numbers_ => [[ unclip-last prefix compose-all [ fix-sign ] append ]]
@ -85,14 +85,15 @@ formats = "%" (types|fmt-%|lists|assocs|unknown) => [[ second '[ _ dip ] ]]
plain-text = (!("%").)+ => [[ >string '[ _ swap ] ]] plain-text = (!("%").)+ => [[ >string '[ _ swap ] ]]
text = (formats|plain-text)* => [[ reverse [ [ [ push ] keep ] append ] map ]] text = (formats|plain-text)* => [[ <reversed> [ [ [ push ] keep ] append ] map ]]
;EBNF ;EBNF
PRIVATE> PRIVATE>
MACRO: printf ( format-string -- ) MACRO: printf ( format-string -- )
parse-printf [ length ] keep compose-all '[ _ <vector> @ reverse [ write ] each ] ; parse-printf [ length ] keep compose-all
'[ _ <vector> @ <reversed> [ write ] each ] ;
: sprintf ( format-string -- result ) : sprintf ( format-string -- result )
[ printf ] with-string-writer ; inline [ printf ] with-string-writer ; inline