formatting: support space prefix for numbers.

diff --git a/basis/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor
index a5a463ff04f67f60eb3d0506151aebaf186495a3..92b28650cc99568c8bf06f0aa6bd9fe9c3f1e80e 100755 (executable)
--- a/basis/formatting/formatting-tests.factor
+++ b/basis/formatting/formatting-tests.factor
@@ -11,6 +11,8 @@ IN: formatting.tests
 [ "10" ] [ 10 "%d" sprintf ] unit-test
 [ "+10" ] [ 10 "%+d" sprintf ] unit-test
 [ "-10" ] [ -10 "%d" sprintf ] unit-test
+[ " 23" ] [ 23 "% d" sprintf ] unit-test
+[ "-23" ] [ -23 "% d" sprintf ] unit-test
 [ "  -10" ] [ -10 "%5d" sprintf ] unit-test
 [ "-0010" ] [ -10 "%05d" sprintf ] unit-test
 [ "+0010" ] [ 10 "%+05d" sprintf ] unit-test

diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index aa7d6c0f8012c85445cf700c8a9bbe1c1ab7da05..69d8f544e2dd24bd1490201e0fe899b611d5360b 100644 (file)
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -48,7 +48,8 @@ pad-align = ("-")?               => [[ \ pad-tail \ pad-head ? ]]
 pad-width = ([0-9])*             => [[ >digits ]]
 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 [ _ prefix ] unless ] ]]
+sign      = (sign_)?             => [[ [ ] or ]]
 
 width_    = "." ([0-9])*         => [[ second >digits '[ _ short head ] ]]
 width     = (width_)?            => [[ [ ] or ]]