sequences.extras: Fix bad rename. (each-from) -> setup-each-from now. Add a unit...

diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor
index 29c9247ef0b6de2141983e3754c24cc4e8462538..b4c8038f24894a9f331b215248bda6be072c9c6c 100644 (file)
--- a/extra/sequences/extras/extras-tests.factor
+++ b/extra/sequences/extras/extras-tests.factor
@@ -181,3 +181,5 @@ IN: sequences.extras.tests
 { { 0 3 } } [ "ABA" "ABAABA" start-all ] unit-test
 { 1 } [ "ABA" "ABABA" count-subseq ] unit-test
 { 2 } [ "ABA" "ABABA" count-subseq* ] unit-test
+
+{ 120000 } [ { 10 20 30 40 50 60 } 1 [ * ] 3 reduce-from ] unit-test

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 1803155e92679b5e9760c4815c05671cd3fb0fba..eabf091b7336250040fda942d256d8abae52f3c9 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -208,16 +208,16 @@ PRIVATE>
 
 <PRIVATE
 
-: (each-from) ( i seq -- n quot )
+: (setup-each-from) ( i seq -- n quot )
     [ length over [-] swap ] keep '[ _ + _ nth-unsafe ] ; inline
 
-: each-from ( i seq quot -- n quot' )
-    [ (each-from) ] dip compose ; inline
+: setup-each-from ( i seq quot -- n quot' )
+    [ (setup-each-from) ] dip compose ; inline
 
 PRIVATE>
 
 : map-from-as ( ... seq quot: ( ... elt -- ... newelt ) i exemplar -- ... newseq )
-    [ -rot each-from ] dip map-integers ; inline
+    [ -rot setup-each-from ] dip map-integers ; inline
 
 : map-from ( ... seq quot: ( ... elt -- ... newelt ) i -- ... newseq )
     pick map-from-as ; inline