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

math.parser: exactly allocate sbuf for fixnums.

db4
John Benediktsson 2013-03-28 11:55:52 -07:00
parent ff39d3f53a
commit 412382abca
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
! Copyright (C) 2009 Joe Groff, 2013 John Benediktsson ! Copyright (C) 2009 Joe Groff, 2013 John Benediktsson
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors byte-arrays combinators kernel kernel.private USING: accessors byte-arrays combinators kernel kernel.private
layouts make math namespaces sbufs sequences sequences.private layouts make math math.private namespaces sbufs sequences
splitting strings ; sequences.private splitting strings ;
IN: math.parser IN: math.parser
: digit> ( ch -- n ) : digit> ( ch -- n )
@ -47,7 +47,7 @@ TUPLE: number-parse
[ / ] [ drop f ] if* ; inline [ / ] [ drop f ] if* ; inline
TUPLE: float-parse TUPLE: float-parse
{ radix read-only } { radix fixnum read-only }
{ point read-only } { point read-only }
{ exponent read-only } ; { exponent read-only } ;
@ -345,8 +345,44 @@ CONSTANT: ONES B{
[ over 10 >= ] [ (two-digit) ] while [ over 10 >= ] [ (two-digit) ] while
[ over zero? ] [ (one-digit) ] until ; inline [ over zero? ] [ (one-digit) ] until ; inline
: (positive>dec) ( num -- str ) GENERIC: (positive>dec) ( num -- str )
3 <sbuf> (bignum>dec) (fixnum>dec) "" like reverse! nip ; inline
M: bignum (positive>dec)
12 <sbuf> (bignum>dec) (fixnum>dec) "" like reverse! nip ; inline
: (count-digits) ( digits n -- digits' )
{
{ [ dup 10 < ] [ drop ] }
{ [ dup 100 < ] [ drop 1 fixnum+fast ] }
{ [ dup 1,000 < ] [ drop 2 fixnum+fast ] }
[
dup 1,000,000,000,000 < [
dup 100,000,000 < [
dup 1,000,000 < [
dup 10,000 < [
drop 3
] [
100,000 >= 5 4 ?
] if
] [
10,000,000 >= 7 6 ?
] if
] [
dup 10,000,000,000 < [
1,000,000,000 >= 9 8 ?
] [
100,000,000,000 >= 11 10 ?
] if
] if fixnum+fast
] [
[ 12 fixnum+fast ] [ 1,000,000,000,000 /i ] bi*
(count-digits)
] if
]
} cond ; inline recursive
M: fixnum (positive>dec)
1 over (count-digits) <sbuf> (fixnum>dec) "" like reverse! nip ; inline
: (positive>base) ( num radix -- str ) : (positive>base) ( num radix -- str )
dup 1 <= [ invalid-radix ] when dup 1 <= [ invalid-radix ] when
@ -361,6 +397,7 @@ PRIVATE>
GENERIC# >base 1 ( n radix -- str ) GENERIC# >base 1 ( n radix -- str )
: number>string ( n -- str ) 10 >base ; inline : number>string ( n -- str ) 10 >base ; inline
: >bin ( n -- str ) 2 >base ; inline : >bin ( n -- str ) 2 >base ; inline
: >oct ( n -- str ) 8 >base ; inline : >oct ( n -- str ) 8 >base ; inline
: >hex ( n -- str ) 16 >base ; inline : >hex ( n -- str ) 16 >base ; inline