factor: trim using lists

[factor.git] / basis / sequences / unrolled / unrolled.factor

diff --git a/basis/sequences/unrolled/unrolled.factor b/basis/sequences/unrolled/unrolled.factor
index 83da65e6db1d9a5cffdb9e78804a67debea4a409..a6a408f7145a1f037cdd1bc5cb8e642ab57eba74 100644 (file)
--- a/basis/sequences/unrolled/unrolled.factor
+++ b/basis/sequences/unrolled/unrolled.factor
@@ -1,7 +1,8 @@
-! (c)2010 Joe Groff bsd license
-USING: combinators combinators.short-circuit fry generalizations kernel
-locals macros math quotations sequences compiler.tree.propagation.transforms ;
-FROM: sequences.private => (each) (each-index) (2each) nth-unsafe set-nth-unsafe ;
+! Copyright (C) 2010 Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: combinators combinators.short-circuit
+compiler.tree.propagation.transforms kernel math
+sequences sequences.private ;
 IN: sequences.unrolled
 
 <PRIVATE
@@ -9,7 +10,7 @@ IN: sequences.unrolled
     swap '[ _ call( i -- ) ] each-integer ;
 
 << \ (unrolled-each-integer) [
-    iota [ '[ _ swap call( i -- ) ] ] [ ] map-as '[ _ cleave ]
+    <iota> [ '[ _ swap call( i -- ) ] ] [ ] map-as '[ _ cleave ]
 ] 1 define-partial-eval >>
 
 : (unrolled-collect) ( quot into -- quot' )
@@ -24,7 +25,7 @@ PRIVATE>
     (unrolled-collect) unrolled-each-integer ; inline
 
 : unrolled-map-integers ( n quot: ( n -- value ) exemplar -- newseq )
-    [ over ] dip [ [ unrolled-collect ] keep ] new-like ; inline
+    overd [ [ unrolled-collect ] keep ] new-like ; inline
 
 ERROR: unrolled-bounds-error
     seq unroll-length ;
@@ -69,7 +70,7 @@ ERROR: unrolled-2bounds-error
     pick unrolled-map-as-unsafe ; inline
 
 : unrolled-2map-unsafe ( xseq yseq len quot: ( x y -- newx ) -- newseq )
-    4 npick unrolled-2map-as-unsafe ; inline
+    reach unrolled-2map-as-unsafe ; inline
 
 PRIVATE>
 
@@ -92,8 +93,7 @@ PRIVATE>
     pick unrolled-map-as ; inline
 
 : unrolled-2map ( xseq yseq len quot: ( x y -- newx ) -- newseq )
-    4 npick unrolled-2map-as ; inline
+    reach unrolled-2map-as ; inline
 
 : unrolled-map-index ( seq len quot: ( x i -- newx ) -- newseq )
-    [ dup length iota ] 2dip unrolled-2map ; inline
-
+    [ dup length <iota> ] 2dip unrolled-2map ; inline