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

Fix negative zero

db4
Slava Pestov 2008-07-20 00:56:25 -05:00
parent 37af854b18
commit 89d3c0c616
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,10 +77,6 @@ unit-test
[ "-101.0e-2" string>number number>string ] [ "-101.0e-2" string>number number>string ]
unit-test unit-test
[ 5.0 ]
[ "10.0/2" string>number ]
unit-test
[ f ] [ f ]
[ "1e1/2" string>number ] [ "1e1/2" string>number ]
unit-test unit-test
@ -104,3 +100,5 @@ unit-test
[ "1.0/0.0" ] [ 1.0 0.0 / number>string ] unit-test [ "1.0/0.0" ] [ 1.0 0.0 / number>string ] unit-test
[ "-1.0/0.0" ] [ -1.0 0.0 / number>string ] unit-test [ "-1.0/0.0" ] [ -1.0 0.0 / number>string ] unit-test
[ "-0.0" ] [ -0.0 number>string ] unit-test

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

@ -73,13 +73,14 @@ PRIVATE>
: base> ( str radix -- n/f ) : base> ( str radix -- n/f )
[ [
CHAR: . over member? [
string>float
] [
"-" ?head dup negative? set >r "-" ?head dup negative? set >r
{ CHAR: / over member?
{ [ CHAR: / over member? ] [ string>ratio ] } [ string>ratio ] [ string>integer ] if
{ [ CHAR: . over member? ] [ string>float ] }
[ string>integer ]
} cond
r> [ dup [ neg ] when ] when r> [ dup [ neg ] when ] when
] if
] with-radix ; ] with-radix ;
: string>number ( str -- n/f ) 10 base> ; : string>number ( str -- n/f ) 10 base> ;