core: selector-for and collector-for are the wrong naming convention--they should...

[factor.git] / extra / sequences / extras / extras.factor

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 874718d728a66d83f027ec7e19a9a9d787308b9f..e23c9725d1f3d2da8368b4e4fddd5b596ff5cd05 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -93,27 +93,27 @@ IN: sequences.extras
 
 <PRIVATE
 
-: (index-selector-for) ( quot length exampler -- selector accum )
+: (index-selector-as) ( quot length exampler -- selector accum )
     new-resizable [ [ push-if-index ] 2curry ] keep ; inline
 
-: (selector-for*) ( quot length exemplar -- selector accum )
+: (selector-as*) ( quot length exemplar -- selector accum )
     new-resizable [ [ push-if* ] 2curry ] keep ; inline
 
 PRIVATE>
 
-: index-selector-for ( quot exemplar -- selector accum )
-    [ length ] keep (index-selector-for) ; inline
+: index-selector-as ( quot exemplar -- selector accum )
+    [ length ] keep (index-selector-as) ; inline
 
 : index-selector ( quot -- selector accum )
-    V{ } index-selector-for ; inline
+    V{ } index-selector-as ; inline
 
-: selector-for* ( quot exemplar -- selector accum )
-    [ length ] keep (selector-for*) ; inline
+: selector-as* ( quot exemplar -- selector accum )
+    [ length ] keep (selector-as*) ; inline
 
-: selector* ( quot -- selector accum ) V{ } selector-for* ; inline
+: selector* ( quot -- selector accum ) V{ } selector-as* ; inline
 
 : filter-index-as ( ... seq quot: ( ... elt i -- ... ? ) exemplar -- ... seq' )
-    pick length over [ (index-selector-for) [ each-index ] dip ] 2curry dip like ; inline
+    pick length over [ (index-selector-as) [ each-index ] dip ] 2curry dip like ; inline
 
 : filter-index ( ... seq quot: ( ... elt i -- ... ? ) -- ... seq' )
     over filter-index-as ; inline
@@ -251,7 +251,7 @@ PRIVATE>
 
 : map-filter-as ( ... seq map-quot: ( ... elt -- ... newelt ) filter-quot: ( ... newelt -- ... ? ) exemplar -- ... subseq )
     [ pick ] dip swap length over
-    [ (selector-for) [ compose each ] dip ] 2curry dip like ; inline
+    [ (selector-as) [ compose each ] dip ] 2curry dip like ; inline
 
 : map-filter ( ... seq map-quot: ( ... elt -- ... newelt ) filter-quot: ( ... newelt -- ... ? ) -- ... subseq )
     pick map-filter-as ; inline
@@ -615,4 +615,4 @@ PRIVATE>
     '[ _ dip ] assoc-map ; inline
 
 : map-values ( assoc quot: ( value -- value' ) -- assoc )
-    '[ swap _ dip swap ] assoc-map ; inline
\ No newline at end of file
+    '[ swap _ dip swap ] assoc-map ; inline