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

Replace >r r> usage with dip in math.ratios

db4
Aaron Schaefer 2008-11-17 18:13:42 -05:00
parent d328589b87
commit fa88f8825b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/math/ratios/ratios.factor
View File

@ -12,10 +12,10 @@ IN: math.ratios
dup 1 number= [ drop ] [ <ratio> ] if ; inline dup 1 number= [ drop ] [ <ratio> ] if ; inline
: scale ( a/b c/d -- a*d b*c ) : scale ( a/b c/d -- a*d b*c )
2>fraction >r * swap r> * swap ; inline 2>fraction [ * swap ] dip * swap ; inline
: ratio+d ( a/b c/d -- b*d ) : ratio+d ( a/b c/d -- b*d )
denominator swap denominator * ; inline [ denominator ] bi@ * ; inline
PRIVATE> PRIVATE>
@ -24,7 +24,7 @@ M: integer /
"Division by zero" throw "Division by zero" throw
] [ ] [
dup 0 < [ [ neg ] bi@ ] when dup 0 < [ [ neg ] bi@ ] when
2dup gcd nip tuck /i >r /i r> fraction> 2dup gcd nip tuck /i [ /i ] dip fraction>
] if ; ] if ;
M: ratio hashcode* M: ratio hashcode*
@ -52,7 +52,7 @@ M: ratio >= scale >= ;
M: ratio + 2dup scale + -rot ratio+d / ; M: ratio + 2dup scale + -rot ratio+d / ;
M: ratio - 2dup scale - -rot ratio+d / ; M: ratio - 2dup scale - -rot ratio+d / ;
M: ratio * 2>fraction * >r * r> / ; M: ratio * 2>fraction * [ * ] dip / ;
M: ratio / scale / ; M: ratio / scale / ;
M: ratio /i scale /i ; M: ratio /i scale /i ;
M: ratio /f scale /f ; M: ratio /f scale /f ;