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

math.parser: allow 0B, 0O, and 0X number prefixes.

modern-harvey2
John Benediktsson 2017-06-15 15:53:01 -07:00
parent 3bd0776630
commit 13e7ed3986
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/math/parser/parser-tests.factor
View File

@ -318,6 +318,14 @@ unit-test
{ -8 } [ "-0o10" string>number ] unit-test
{ -2 } [ "-0b10" string>number ] unit-test
{ 16 } [ "0X10" string>number ] unit-test
{ 8 } [ "0O10" string>number ] unit-test
{ 2 } [ "0B10" string>number ] unit-test
{ -16 } [ "-0X10" string>number ] unit-test
{ -8 } [ "-0O10" string>number ] unit-test
{ -2 } [ "-0B10" string>number ] unit-test
{ f } [ "01a" string>number ] unit-test
{ f } [ "0x1g" string>number ] unit-test
{ f } [ "0o18" string>number ] unit-test

8
core/math/parser/parser.factor
View File

@ -306,11 +306,11 @@ DEFER: @neg-digit
: with-radix-char ( i number-parse n radix-quot nonradix-quot -- n/f )
[
rot {
{ CHAR: b [ drop 2 ->radix require-next-digit ] }
{ CHAR: o [ drop 8 ->radix require-next-digit ] }
{ CHAR: x [ drop 16 ->radix require-next-digit ] }
{ [ dup "bB" member-eq? ] [ 2drop 2 ->radix require-next-digit ] }
{ [ dup "oO" member-eq? ] [ 2drop 8 ->radix require-next-digit ] }
{ [ dup "xX" member-eq? ] [ 2drop 16 ->radix require-next-digit ] }
[ [ drop ] 2dip swap call ]
} case
} cond
] 2curry next-digit ; inline
: @pos-first-digit ( i number-parse n char -- n/f )