core: rename some words

diff --git a/basis/math/matrices/matrices.factor b/basis/math/matrices/matrices.factor
index 68dbd7c97dffe5b8288872eb365fa2322771d58b..c811027ec5dcf8db0e3705fef9477869adf2ab3e 100644 (file)
--- a/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@ -122,7 +122,7 @@ ALIAS: transpose flip
 
 : unshaped-cols-iota ( matrix -- cols-iota )
   [ first-unsafe length ] keep
 
 : unshaped-cols-iota ( matrix -- cols-iota )
   [ first-unsafe length ] keep

-  [ length min ] 1 sequence-iterator-from each-integer-from <iota> ; inline
+  [ length min ] 1 each-from <iota> ; inline

 
 : generic-anti-transpose-unsafe ( cols-iota matrix -- newmatrix )
     [ <reversed> [ nth-end-unsafe ] with { } map-as ] curry { } map-as ; inline
 
 : generic-anti-transpose-unsafe ( cols-iota matrix -- newmatrix )
     [ <reversed> [ nth-end-unsafe ] with { } map-as ] curry { } map-as ; inline

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index a7b77133794482d7d14a7489fe8b1543325de5ea..8b3697ab9f488492e26a68448b951dadda0538d2 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -291,7 +291,7 @@ ERROR: integer-length-expected obj ;
 : length-sequence ( seq -- n seq )
     [ length check-length ] [ ] bi ; inline
 
 : length-sequence ( seq -- n seq )
     [ length check-length ] [ ] bi ; inline
 

-: >range-iterator< ( slice/seq -- i n slice/seq )
+: >underlying< ( slice/seq -- i n slice/seq )

     dup slice? [ >slice< ] [ >sequence< ] if ; inline
 
 TUPLE: copier
     dup slice? [ >slice< ] [ >sequence< ] if ; inline
 
 TUPLE: copier


@@ -409,18 +409,16 @@ PRIVATE>
 
 <PRIVATE
 
 
 <PRIVATE
 

-: sequence-iterator ( seq quot -- i n quot' )
-    [ >range-iterator< [ nth-unsafe ] curry ] dip compose ; inline
+: sequence-operator ( seq quot -- i n quot' )
+    [ >underlying< [ nth-unsafe ] curry ] dip compose ; inline

 
 

-! setup-1each

 : length-iterator ( seq quot -- n quot' )
     length-sequence [ nth-unsafe ] curry ; inline
 
 : length-iterator ( seq quot -- n quot' )
     length-sequence [ nth-unsafe ] curry ; inline
 

-! (1each)

 : length-operator ( seq quot -- n quot' )
     [ length-iterator ] dip compose ; inline
 
 : length-operator ( seq quot -- n quot' )
     [ length-iterator ] dip compose ; inline
 

-: sequence-iterator-from ( seq quot i -- i n quot' )
+: sequence-operator-from ( seq quot i -- i n quot' )

     -rot length-operator ; inline
 
 : collect ( n quot into -- )
     -rot length-operator ; inline
 
 : collect ( n quot into -- )


@@ -477,10 +475,10 @@ PRIVATE>
 PRIVATE>
 
 : each ( ... seq quot: ( ... x -- ... ) -- ... )
 PRIVATE>
 
 : each ( ... seq quot: ( ... x -- ... ) -- ... )

-    sequence-iterator each-integer-from ; inline
+    sequence-operator each-integer-from ; inline

 
 : each-from ( ... seq quot: ( ... x -- ... ) i -- ... )
 
 : each-from ( ... seq quot: ( ... x -- ... ) i -- ... )

-    sequence-iterator-from each-integer-from ; inline
+    sequence-operator-from each-integer-from ; inline

 
 : reduce ( ... seq identity quot: ( ... prev elt -- ... next ) -- ... result )
     swapd each ; inline
 
 : reduce ( ... seq identity quot: ( ... prev elt -- ... next ) -- ... result )
     swapd each ; inline


@@ -570,7 +568,7 @@ PRIVATE>
     [ find-integer ] (find-index) ; inline
 
 : all? ( ... seq quot: ( ... elt -- ... ? ) -- ... ? )
     [ find-integer ] (find-index) ; inline
 
 : all? ( ... seq quot: ( ... elt -- ... ? ) -- ... ? )

-    sequence-iterator all-integers-from? ; inline
+    sequence-operator all-integers-from? ; inline

 
 : push-if ( ..a elt quot: ( ..a elt -- ..b ? ) accum -- ..b )
     [ keep ] dip rot [ push ] [ 2drop ] if ; inline
 
 : push-if ( ..a elt quot: ( ..a elt -- ..b ? ) accum -- ..b )
     [ keep ] dip rot [ push ] [ 2drop ] if ; inline