sequences.extras: moved 2each-index to extras for now.

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 3047c3e2a1bfa8a480cfc1e6e55bbe5abd47dcb0..78755a97a14a565c801f7cc6b313f95273a7aa9b 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -402,9 +402,6 @@ PRIVATE>
 : (2each) ( seq1 seq2 quot -- n quot' )
     [ ((2each)) ] dip compose ; inline
 
-: (2each-index) ( seq1 seq2 quot -- n quot' )
-    [ ((2each)) [ keep ] curry ] dip compose ; inline
-
 : 3nth-unsafe ( n seq1 seq2 seq3 -- elt1 elt2 elt3 )
     [ nth-unsafe ] tri-curry@ tri ; inline
 
@@ -476,9 +473,6 @@ PRIVATE>
 : 2each ( ... seq1 seq2 quot: ( ... elt1 elt2 -- ... ) -- ... )
     (2each) each-integer ; inline
 
-: 2each-index ( ... seq1 seq2 quot: ( ... elt1 elt2 index -- ... ) -- ... )
-    (2each-index) each-integer ; inline
-
 : 2reduce ( ... seq1 seq2 identity quot: ( ... prev elt1 elt2 -- ... next ) -- ... result )
     [ -rot ] dip 2each ; inline
 

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 5b748ebb2c84e55febc82f3d52239cd0b4fc33aa..767ab95a7eb5bea896a4fb2d3af6442cc93f6990 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -228,6 +228,16 @@ PRIVATE>
 : map-index! ( ... seq quot: ( ... elt index -- ... newelt ) -- ... seq )
     over [ [ (each-index) ] dip collect ] keep ; inline
 
+<PRIVATE
+
+: (2each-index) ( seq1 seq2 quot -- n quot' )
+    [ ((2each)) [ keep ] curry ] dip compose ; inline
+
+PRIVATE>
+
+: 2each-index ( ... seq1 seq2 quot: ( ... elt1 elt2 index -- ... ) -- ... )
+    (2each-index) each-integer ; inline
+
 : 2map-into ( seq1 seq2 quot into -- )
     [ (2each) ] dip collect ; inline