kernel: move recusrive-hashcode to math and add test

[factor.git] / core / math / math.factor

diff --git a/core/math/math.factor b/core/math/math.factor
index 548e628cc716bb14d4fd82fd6a5eaab19ef39aac..869d0aa133261075d9f419eb25d813d9f07d3770 100644 (file)
--- a/core/math/math.factor
+++ b/core/math/math.factor
@@ -131,6 +131,9 @@ GENERIC: (log2) ( x -- n ) foldable
 
 PRIVATE>
 
+: recursive-hashcode ( n obj quot -- code )
+    pick 0 <= [ 3drop 0 ] [ [ 1 - ] 2dip call ] if ; inline
+
 ERROR: log2-expects-positive x ;
 
 : log2 ( x -- n )
@@ -255,6 +258,12 @@ GENERIC: prev-float ( m -- n )
         3drop
     ] if ; inline recursive
 
+: each-integer ( ... n quot: ( ... i -- ... ) -- ... )
+    [ 0 ] 2dip each-integer-from ; inline
+
+: times ( ... n quot: ( ... -- ... ) -- ... )
+    [ drop ] prepose each-integer ; inline
+
 : find-integer-from ( ... i n quot: ( ... i -- ... ? ) -- ... i/f )
     2over < [
         [ nip call ] 3keep roll
@@ -264,14 +273,17 @@ GENERIC: prev-float ( m -- n )
         3drop f
     ] if ; inline recursive
 
-: find-last-integer-from ( ... n quot: ( ... i -- ... ? ) -- ... i/f )
+: find-integer ( ... n quot: ( ... i -- ... ? ) -- ... i/f )
+    [ 0 ] 2dip find-integer-from ; inline
+
+: find-last-integer ( ... n quot: ( ... i -- ... ? ) -- ... i/f )
     over 0 < [
         2drop f
     ] [
         [ call ] 2keep rot [
             drop
         ] [
-            [ 1 - ] dip find-last-integer-from
+            [ 1 - ] dip find-last-integer
         ] if
     ] if ; inline recursive
 
@@ -284,14 +296,5 @@ GENERIC: prev-float ( m -- n )
         3drop t
     ] if ; inline recursive
 
-: each-integer ( ... n quot: ( ... i -- ... ) -- ... )
-    [ 0 ] 2dip each-integer-from ; inline
-
-: times ( ... n quot: ( ... -- ... ) -- ... )
-    [ drop ] prepose each-integer ; inline
-
-: find-integer ( ... n quot: ( ... i -- ... ? ) -- ... i/f )
-    [ 0 ] 2dip find-integer-from ; inline
-
 : all-integers? ( ... n quot: ( ... i -- ... ? ) -- ... ? )
     [ 0 ] 2dip all-integers-from? ; inline