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

formatting, allow uppercase exponent for bin floats in base 2 and 8

modern-harvey2
Jon Harper 2017-02-26 15:54:35 +01:00 committed by John Benediktsson
parent ccbb8116fc
commit 6061da92be
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/formatting/formatting-docs.factor
View File

@ -23,7 +23,9 @@ HELP: printf
{ { $snippet "%+Px" } "Base 16 General format" "real" }
{ { $snippet "%+PX" } "Base 16 General format uppercase" "real" }
{ { $snippet "%+Po" } "Base 8 General format" "real" }
{ { $snippet "%+PO" } "Base 8 General format uppercase" "real" }
{ { $snippet "%+Pb" } "Base 2 General format" "real" }
{ { $snippet "%+PB" } "Base 2 General format uppercase" "real" }
{ { $snippet "%+P.De" } "Base 10 Scientific format" "real" }
{ { $snippet "%+P.DE" } "Base 10 Scientific format uppercase" "real" }
{ { $snippet "%+P.Df" } "Base 10 Fixed format" "real" }

2
basis/formatting/formatting-tests.factor
View File

@ -89,7 +89,9 @@ IN: formatting.tests
{ "1.9p0" } [ 1.5625 "%x" sprintf ] unit-test
{ "1.9P0" } [ 1.5625 "%X" sprintf ] unit-test
{ "1.44p0" } [ 1.5625 "%o" sprintf ] unit-test
{ "1.44P0" } [ 1.5625 "%O" sprintf ] unit-test
{ "1.1001p0" } [ 1.5625 "%b" sprintf ] unit-test
{ "1.1001P0" } [ 1.5625 "%B" sprintf ] unit-test
{ "14+17/20" } [ 14+17/20 "%d" sprintf ] unit-test
{ "e+11/14" } [ 14+17/20 "%x" sprintf ] unit-test
{ "E+11/14" } [ 14+17/20 "%X" sprintf ] unit-test

4
basis/formatting/formatting.factor
View File

@ -115,7 +115,9 @@ fmt-S = "S" => [[ [ present >upper ] ]]
fmt-u = "u" => [[ [ unparse ] ]]
fmt-d = "d" => [[ [ number>string ] ]]
fmt-o = "o" => [[ [ >oct ] ]]
fmt-O = "O" => [[ [ >oct >upper ] ]]
fmt-b = "b" => [[ [ >bin ] ]]
fmt-B = "B" => [[ [ >bin >upper ] ]]
fmt-e = digits "e" => [[ first '[ _ format-scientific ] ]]
fmt-E = digits "E" => [[ first '[ _ format-scientific >upper ] ]]
fmt-f = digits "f" => [[ first '[ _ format-decimal ] ]]
@ -126,7 +128,7 @@ unknown = (.)* => [[ unknown-printf-directive ]]
strings_ = fmt-c|fmt-C|fmt-s|fmt-S|fmt-u
strings = pad width strings_ => [[ <reversed> compose-all ]]
numbers_ = fmt-d|fmt-o|fmt-b|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
numbers_ = fmt-d|fmt-o|fmt-O|fmt-b|fmt-B|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
numbers = sign pad numbers_ => [[ unclip-last prefix compose-all [ fix-sign ] append ]]
types = strings|numbers