math: rename fast-gcd to simple-gcd.

diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor
index 640f28be7b60eaf7202607561eb67b7e7d9a02cb..1fde152dcb1903f333c41d8bc25e87d71cfa93f1 100644 (file)
--- a/basis/math/functions/functions.factor
+++ b/basis/math/functions/functions.factor
@@ -106,7 +106,7 @@ PRIVATE>
 : nth-root ( n x -- y ) swap recip ^ ; inline
 
 : lcm ( a b -- c )
-    [ * ] 2keep fast-gcd /i ; foldable
+    [ * ] 2keep simple-gcd /i ; foldable
 
 : divisor? ( m n -- ? )
     mod 0 = ; inline

diff --git a/basis/math/partial-dispatch/partial-dispatch.factor b/basis/math/partial-dispatch/partial-dispatch.factor
index 078908604489f7dac4206b5158c312c60d22e2ab..cc31dd6acde65ef007d4ad2f6f01c01bcd277721 100644 (file)
--- a/basis/math/partial-dispatch/partial-dispatch.factor
+++ b/basis/math/partial-dispatch/partial-dispatch.factor
@@ -216,7 +216,7 @@ SYMBOL: fast-math-ops
         \ mod \ fixnum-mod \ bignum-mod define-integer-ops
         \ /i \ fixnum/i \ bignum/i define-integer-ops
 
-        \ fast-gcd \ simple-gcd \ bignum-gcd define-integer-ops
+        \ simple-gcd \ fixnum-gcd \ bignum-gcd define-integer-ops
 
         \ bitand \ fixnum-bitand \ bignum-bitand define-integer-ops
         \ bitor \ fixnum-bitor \ bignum-bitor define-integer-ops

diff --git a/core/math/math.factor b/core/math/math.factor
index 23f4d10a1e62438d17e916773d9c928146dab5fd..b23e129946579b98699b27dd2a8de528529835e7 100644 (file)
--- a/core/math/math.factor
+++ b/core/math/math.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2003, 2009 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel ;
+USING: kernel kernel.private ;
 IN: math
 
 BUILTIN: fixnum ;
@@ -202,17 +202,17 @@ PRIVATE>
 : gcd ( x y -- a d )
     [ 0 1 ] 2dip (gcd) dup 0 < [ neg ] when ; inline
 
-MATH: fast-gcd ( x y -- d ) foldable
+MATH: simple-gcd ( x y -- d ) foldable
 
 <PRIVATE
 
-: simple-gcd ( x y -- d ) gcd nip ; inline
+: fixnum-gcd ( x y -- d ) { fixnum fixnum } declare gcd nip ;
 
 PRIVATE>
 
-M: real fast-gcd simple-gcd ; inline
+M: fixnum simple-gcd fixnum-gcd ; inline
 
-M: bignum fast-gcd bignum-gcd ; inline
+M: bignum simple-gcd bignum-gcd ; inline
 
 : fp-bitwise= ( x y -- ? ) [ double>bits ] same? ; inline
 

diff --git a/core/math/ratios/ratios.factor b/core/math/ratios/ratios.factor
index 167d335b9bac0f2635e936c70231edff29756739..669f1c990f7736a4b63d53e7266e777c487d582d 100644 (file)
--- a/core/math/ratios/ratios.factor
+++ b/core/math/ratios/ratios.factor
@@ -29,7 +29,7 @@ M: integer /
         division-by-zero
     ] [
         dup 0 < [ [ neg ] bi@ ] when
-        2dup fast-gcd [ /i ] curry bi@ fraction>
+        2dup simple-gcd [ /i ] curry bi@ fraction>
     ] if-zero ;
 
 M: integer recip