From e966330bbb8ef5ce7759b2bfaffa8020db8d9db6 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 17 Sep 2008 23:11:02 -0700 Subject: [PATCH] printf: Allow positive sign to prefix numbers, add more tests, fix negative numbers in exponentials. --- extra/printf/printf-tests.factor | 24 ++++++++++++++++++++++++ extra/printf/printf.factor | 30 ++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/extra/printf/printf-tests.factor b/extra/printf/printf-tests.factor index 9a608cbffc..084553c54d 100644 --- a/extra/printf/printf-tests.factor +++ b/extra/printf/printf-tests.factor @@ -7,6 +7,16 @@ USING: kernel printf tools.test ; [ t ] [ "10" 10 "%d" sprintf = ] unit-test +[ t ] [ "+10" 10 "%+d" sprintf = ] unit-test + +[ t ] [ "-10" -10 "%d" sprintf = ] unit-test + +[ t ] [ " -10" -10 "%5d" sprintf = ] unit-test + +[ t ] [ "-0010" -10 "%05d" sprintf = ] unit-test + +[ t ] [ "+0010" 10 "%+05d" sprintf = ] unit-test + [ t ] [ "123.456" 123.456 "%f" sprintf = ] unit-test [ t ] [ "123.10" 123.1 "%01.2f" sprintf = ] unit-test @@ -17,6 +27,8 @@ USING: kernel printf tools.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 ] [ "3.625e+08" 362525200 "%.3e" sprintf = ] unit-test @@ -25,6 +37,18 @@ USING: kernel printf tools.test ; [ t ] [ "2.5E-03" 0.0025 "%E" sprintf = ] unit-test +[ t ] [ " 1.0E+01" 10 "%10.1E" sprintf = ] unit-test + +[ t ] [ " -1.0E+01" -10 "%10.1E" sprintf = ] unit-test + +[ t ] [ " -1.0E+01" -10 "%+10.1E" sprintf = ] unit-test + +[ t ] [ " +1.0E+01" 10 "%+10.1E" sprintf = ] unit-test + +[ t ] [ "-001.0E+01" -10 "%+010.1E" sprintf = ] unit-test + +[ t ] [ "+001.0E+01" 10 "%+010.1E" sprintf = ] unit-test + [ t ] [ "ff" HEX: ff "%x" sprintf = ] unit-test [ t ] [ "FF" HEX: ff "%X" sprintf = ] unit-test diff --git a/extra/printf/printf.factor b/extra/printf/printf.factor index 4c66db3661..346a344093 100644 --- a/extra/printf/printf.factor +++ b/extra/printf/printf.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2008 John Benediktsson ! 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 combinators kernel sequences splitting strings math math.parser macros -fry peg.ebnf unicode.case arrays quotations vectors ; +fry peg.ebnf ascii unicode.case arrays quotations vectors ; IN: printf @@ -12,11 +12,17 @@ IN: printf : compose-all ( seq -- quot ) [ ] [ compose ] reduce ; -: fix-neg ( string -- string ) +: fix-sign ( string -- string ) dup CHAR: 0 swap index 0 = - [ dup CHAR: - swap index dup - [ swap remove-nth "-" prepend ] - [ drop ] if ] when ; + [ dup 0 swap [ [ CHAR: 0 = not ] keep digit? and ] find-from + [ dup 1- rot dup [ nth ] dip swap + { + { CHAR: - [ [ 1- ] dip remove-nth "-" prepend ] } + { CHAR: + [ [ 1- ] dip remove-nth "+" prepend ] } + [ drop swap drop ] + } case + ] [ drop ] if + ] when ; : >digits ( string -- digits ) [ 0 ] [ string>number ] if-empty ; @@ -28,16 +34,18 @@ IN: printf [ dup length ] dip [ > ] keep swap [ head-slice >string ] [ drop ] if ; : >exponential ( n -- base exp ) + [ 0 < ] keep abs 0 - [ swap dup [ 10.0 > ] keep 1.0 < or ] - [ dup 10.0 > + [ swap dup [ 10.0 >= ] keep 1.0 < or ] + [ dup 10.0 >= [ 10.0 / [ 1+ ] dip swap ] [ 10.0 * [ 1- ] dip swap ] if ] [ swap ] while [ number>string ] dip dup abs number>string 2 CHAR: 0 pad-left [ 0 < [ "-" ] [ "+" ] if ] dip append - "e" prepend ; + "e" prepend + rot [ [ "-" prepend ] dip ] when ; EBNF: parse-format-string @@ -49,6 +57,8 @@ pad-align = ("-")? => [[ [ [ pad-right ] ] [ [ pad-left ] ] if ]] pad-width = ([0-9])* => [[ >digits 1quotation ]] pad = pad-align pad-char pad-width => [[ reverse compose-all [ first ] keep swap 0 = [ drop [ ] ] when ]] +sign = ("+")? => [[ [ [ dup CHAR: - swap index not [ "+" prepend ] when ] ] [ [ ] ] if ]] + width_ = "." ([0-9])* => [[ second >digits '[ _ max-width ] ]] width = (width_)? => [[ [ ] or ]] @@ -74,7 +84,7 @@ 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 = sign pad (decimals|floats|hex|exps) => [[ reverse first3 swap 3append [ fix-sign ] append ]] formats = "%" (chars|strings|numbers|fmt-%|unknown) => [[ second '[ _ dip ] ]]