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

math.parser: better error messages suggested by @erg.

db4
John Benediktsson 2012-06-06 15:12:33 -07:00
parent 9dbeef4933
commit 3967b19aa5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,10 @@ IN: math.parser
[ CHAR: a 10 - - dup 10 < [ drop 255 ] when ] [ CHAR: a 10 - - dup 10 < [ drop 255 ] when ]
} cond ; inline } cond ; inline
ERROR: invalid-radix radix ;
ERROR: invalid-base n base ;
<PRIVATE <PRIVATE
TUPLE: number-parse TUPLE: number-parse
@ -309,7 +313,7 @@ PRIVATE>
<PRIVATE <PRIVATE
: positive>base ( num radix -- str ) : positive>base ( num radix -- str )
dup 1 <= [ "Invalid radix" throw ] when dup 1 <= [ invalid-radix ] when
[ dup 0 > ] swap [ /mod >digit ] curry "" produce-as nip [ dup 0 > ] swap [ /mod >digit ] curry "" produce-as nip
reverse! ; inline reverse! ; inline
@ -409,7 +413,7 @@ M: ratio >base
{ {
{ 16 [ float>hex ] } { 16 [ float>hex ] }
{ 10 [ "%.16g" format-float ] } { 10 [ "%.16g" format-float ] }
[ "Invalid base" throw ] [ invalid-base ]
} case ; inline } case ; inline
PRIVATE> PRIVATE>