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

prettyprint: add an unsupported-number-base error.

locals-and-roots
John Benediktsson 2016-03-30 14:55:11 -07:00
parent 4ce62e0827
commit 99804fd054
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/prettyprint/backend/backend.factor
View File

@ -70,12 +70,15 @@ M: method pprint*
[ [ neg ] [ call ] [ prepend ] tri* "-" prepend text ] [ [ neg ] [ call ] [ prepend ] tri* "-" prepend text ]
[ [ call ] [ prepend ] bi* text ] if ; inline [ [ call ] [ prepend ] bi* text ] if ; inline
ERROR: unsupported-number-base n base ;
M: real pprint* M: real pprint*
number-base get { number-base get {
{ 10 [ number>string text ] }
{ 16 [ [ >hex ] "0x" pprint-prefixed-number ] } { 16 [ [ >hex ] "0x" pprint-prefixed-number ] }
{ 8 [ [ >oct ] "0o" pprint-prefixed-number ] } { 8 [ [ >oct ] "0o" pprint-prefixed-number ] }
{ 2 [ [ >bin ] "0b" pprint-prefixed-number ] } { 2 [ [ >bin ] "0b" pprint-prefixed-number ] }
[ drop number>string text ] [ unsupported-number-base ]
} case ; } case ;
M: float pprint* M: float pprint*
@ -83,8 +86,9 @@ M: float pprint*
\ NAN: [ fp-nan-payload >hex text ] pprint-prefix \ NAN: [ fp-nan-payload >hex text ] pprint-prefix
] [ ] [
number-base get { number-base get {
{ 10 [ number>string text ] }
{ 16 [ [ >hex ] "0x" pprint-prefixed-number ] } { 16 [ [ >hex ] "0x" pprint-prefixed-number ] }
[ drop number>string text ] [ unsupported-number-base ]
} case } case
] if ; ] if ;

6
basis/prettyprint/prettyprint-tests.factor
View File

@ -2,7 +2,7 @@ USING: accessors arrays classes.intersection classes.maybe
classes.union compiler.units continuations definitions effects classes.union compiler.units continuations definitions effects
eval generic generic.standard hashtables io io.streams.duplex eval generic generic.standard hashtables io io.streams.duplex
io.streams.string kernel listener make math namespaces parser io.streams.string kernel listener make math namespaces parser
prettyprint prettyprint.config prettyprint.private prettyprint prettyprint.backend prettyprint.config prettyprint.private
prettyprint.sections see sequences splitting prettyprint.sections see sequences splitting
strings tools.continuations tools.continuations.private strings tools.continuations tools.continuations.private
tools.test vectors vocabs.parser words ; tools.test vectors vocabs.parser words ;
@ -15,8 +15,8 @@ IN: prettyprint.tests
{ "0x1000" } [ 16 number-base [ 4096 unparse ] with-variable ] unit-test { "0x1000" } [ 16 number-base [ 4096 unparse ] with-variable ] unit-test
{ "1.0" } [ 1.0 unparse ] unit-test { "1.0" } [ 1.0 unparse ] unit-test
{ "8.0" } [ 8.0 unparse ] unit-test { "8.0" } [ 8.0 unparse ] unit-test
{ "8.0" } [ 2 number-base [ 8.0 unparse ] with-variable ] unit-test [ 2 number-base [ 8.0 unparse ] with-variable ] [ unsupported-number-base? ] must-fail-with
{ "8.0" } [ 8 number-base [ 8.0 unparse ] with-variable ] unit-test [ 8 number-base [ 8.0 unparse ] with-variable ] [ unsupported-number-base? ] must-fail-with
{ "0x1.0p3" } [ 16 number-base [ 8.0 unparse ] with-variable ] unit-test { "0x1.0p3" } [ 16 number-base [ 8.0 unparse ] with-variable ] unit-test
{ "1267650600228229401496703205376" } [ 1 100 shift unparse ] unit-test { "1267650600228229401496703205376" } [ 1 100 shift unparse ] unit-test