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

Minor tweak to math.text.english

db4
Aaron Schaefer 2008-01-21 22:36:20 -05:00
parent a06b67baa7
commit 62415768ca
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/math/text/english/english.factor
View File

@ -12,10 +12,10 @@ IN: math.text.english
"Seventeen" "Eighteen" "Nineteen" } nth ; "Seventeen" "Eighteen" "Nineteen" } nth ;
: tens ( n -- str ) : tens ( n -- str )
{ "" "" "Twenty" "Thirty" "Forty" "Fifty" "Sixty" "Seventy" "Eighty" "Ninety" } nth ; { f f "Twenty" "Thirty" "Forty" "Fifty" "Sixty" "Seventy" "Eighty" "Ninety" } nth ;
: scale-numbers ( n -- str ) ! up to 10^99 : scale-numbers ( n -- str ) ! up to 10^99
{ "" "Thousand" "Million" "Billion" "Trillion" "Quadrillion" "Quintillion" { f "Thousand" "Million" "Billion" "Trillion" "Quadrillion" "Quintillion"
"Sextillion" "Septillion" "Octillion" "Nonillion" "Decillion" "Undecillion" "Sextillion" "Septillion" "Octillion" "Nonillion" "Decillion" "Undecillion"
"Duodecillion" "Tredecillion" "Quattuordecillion" "Quindecillion" "Duodecillion" "Tredecillion" "Quattuordecillion" "Quindecillion"
"Sexdecillion" "Septendecillion" "Octodecillion" "Novemdecillion" "Sexdecillion" "Septendecillion" "Octodecillion" "Novemdecillion"
@ -45,7 +45,7 @@ SYMBOL: and-needed?
: tens-place ( n -- str ) : tens-place ( n -- str )
100 mod dup 20 >= [ 100 mod dup 20 >= [
10 /mod >r tens r> 10 /mod [ tens ] dip
dup zero? [ drop ] [ "-" swap small-numbers 3append ] if dup zero? [ drop ] [ "-" swap small-numbers 3append ] if
] [ ] [
dup zero? [ drop "" ] [ small-numbers ] if dup zero? [ drop "" ] [ small-numbers ] if
@ -97,3 +97,4 @@ PRIVATE>
] [ ] [
[ (number>text) ] with-scope [ (number>text) ] with-scope
] if ; ] if ;