core; move find* to extras

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 798c9da377573aab5bd06e72ad7f6010245fdf77..fc9e31376374eea3902bfc61fb8795a314dc3e4d 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -616,27 +616,6 @@ PRIVATE>
 : find-index ( ... seq quot: ( ... elt i -- ... ? ) -- ... i elt )
     [ 0 ] 2dip find-index-from ; inline
 
-: find-from* ( ... n seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
-    '[ _ do-find-from element/index ] bounds-check-call ; inline
-
-: find* ( ... seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
-    [ 0 ] 2dip do-find-from element/index ; inline
-
-: find-last-from* ( ... n seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
-    '[ _ find-last-from-unsafe element/index ] bounds-check-call ; inline
-
-: find-last* ( ... seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
-    [ index-of-last ] dip find-last-from* ; inline
-
-: find-index-from* ( ... n seq quot: ( ... elt i -- ... ? ) -- ... elt i/f )
-    '[
-        _ [ sequence-index-operator find-integer-from ] keepd
-        element/index
-    ] bounds-check-call ; inline
-
-: find-index* ( ... seq quot: ( ... elt i -- ... ? ) -- ... elt i/f )
-    [ 0 ] 2dip find-index-from* ; inline
-
 : all? ( ... seq quot: ( ... elt -- ... ? ) -- ... ? )
     sequence-operator all-integers-from? ; inline
 

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 1d5dc80b97ed8aa862ba05f5c30aad1992729655..ac0c0afee49c09c7b56a280929f6094f66064519 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -684,6 +684,27 @@ PRIVATE>
 : map-find-index ( ... seq quot: ( ... elt index -- ... result/f ) -- ... result i elt )
     [ find-index ] (map-find-index) ; inline
 
+: find-from* ( ... n seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
+    '[ _ do-find-from element/index ] bounds-check-call ; inline
+
+: find* ( ... seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
+    [ 0 ] 2dip do-find-from element/index ; inline
+
+: find-last-from* ( ... n seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
+    '[ _ find-last-from-unsafe element/index ] bounds-check-call ; inline
+
+: find-last* ( ... seq quot: ( ... elt -- ... ? ) -- ... elt i/f )
+    [ index-of-last ] dip find-last-from* ; inline
+
+: find-index-from* ( ... n seq quot: ( ... elt i -- ... ? ) -- ... elt i/f )
+    '[
+        _ [ sequence-index-operator find-integer-from ] keepd
+        element/index
+    ] bounds-check-call ; inline
+
+: find-index* ( ... seq quot: ( ... elt i -- ... ? ) -- ... elt i/f )
+    [ 0 ] 2dip find-index-from* ; inline
+
 : filter-length ( seq n -- seq' ) '[ length _ = ] filter ;
 
 : all-shortest ( seqs -- seqs' ) dup shortest length filter-length ;