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

math.parser: some inline, some fixnum+fast, some disable tests.

db4
John Benediktsson 2015-07-30 17:59:21 -07:00
parent 8d827b2772
commit b3323c15bd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,7 +450,8 @@ unit-test
! works with ratios
{ 0.25 } [ "1/4" 3000 [ CHAR: 0 ] "" replicate-as append "e-3000" append string>number ] unit-test
{ 1.25 } [ "1+1/4" 3000 [ CHAR: 0 ] "" replicate-as append "e-3000" append string>number ] unit-test
! XXX: disable for right now, see #1362 or #1408
! { 1.25 } [ "1+1/4" 3000 [ CHAR: 0 ] "" replicate-as append "e-3000" append string>number ] unit-test
! #1356 #1231
{ 1/0. } [ "1e100000" string>number ] unit-test

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

@ -51,13 +51,13 @@ TUPLE: number-parse
[ 2nip ] (next-digit) ; inline
: inc-magnitude ( number-parse -- number-parse' )
[ 1 + ] change-magnitude ; inline
[ 1 fixnum+fast ] change-magnitude ; inline
: ?inc-magnitude ( number-parse n -- number-parse' )
zero? [ inc-magnitude ] unless ; inline
: (add-digit) ( number-parse n digit -- number-parse n' )
[ dup radix>> ] [ * ] [ + ] tri* ;
[ dup radix>> ] [ * ] [ + ] tri* ; inline
: add-digit ( i number-parse n digit quot -- n/f )
[ (add-digit) [ ?inc-magnitude ] keep ] dip next-digit ; inline
@ -77,7 +77,7 @@ TUPLE: float-parse
{ exponent }
{ magnitude } ;
: inc-point-?dec-magnitude ( float-parse n -- float-parse' )
zero? [ [ 1 - ] change-magnitude ] when
zero? [ [ 1 fixnum-fast ] change-magnitude ] when
[ 1 + ] change-point ; inline
: store-exponent ( float-parse n expt -- float-parse' n )