sequences: move (2selector-as)

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 7761b49bb7115459ec32d3e9a7d544c33a09f9cb..a2bf15cbe6a7e0b32705d7ca60d142861daac2a6 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -635,9 +635,6 @@ PRIVATE>
 : push-when ( ..a elt quot: ( ..a elt -- ..b ? ) accum -- ..b )
     [ keep ] dip rot [ push ] [ 2drop ] if ; inline
 
-: 2push-when ( ..a elt1 elt2 quot: ( ..a elt1 elt2 -- ..b ? ) accum -- ..b )
-    [ keepd ] dip rot [ push ] [ 2drop ] if ; inline
-
 : call-push-when ( ..a elt quot: ( ..a elt -- ..b elt' ? ) accum -- ..b )
     [ call ] dip swap [ push ] [ 2drop ] if ; inline
 
@@ -646,9 +643,6 @@ PRIVATE>
 : (selector-as) ( quot length exemplar -- selector accum )
     new-resizable [ [ push-when ] 2curry ] keep ; inline
 
-: (2selector-as) ( quot length exemplar -- selector accum )
-    new-resizable [ [ 2push-when ] 2curry ] keep ; inline
-
 PRIVATE>
 
 : selector-as ( quot exemplar -- selector accum )

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index e128db43e7c5e9b1da4c0aad0739cbdcdb10d823..8ad6cd0ab923bda03348af32e9b40a3fe959a5a2 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -404,6 +404,11 @@ PRIVATE>
 : 2reject-map ( ... seq1 seq2 quot: ( ... elt1 elt2 -- ... ? ) map-quot: ( elt1 elt2 -- obj ) -- ... newseq )
     pick 2reject-map-as ; inline
 
+: 2push-when ( ..a elt1 elt2 quot: ( ..a elt1 elt2 -- ..b ? ) accum -- ..b )
+    [ keepd ] dip rot [ push ] [ 2drop ] if ; inline
+
+: (2selector-as) ( quot length exemplar -- selector accum )
+    new-resizable [ [ 2push-when ] 2curry ] keep ; inline
 
 : 2filter-as ( ... seq1 seq2 quot: ( ... elt1 elt2 -- ... newelt ) exemplar -- ... newseq )
     [