generalizations: Update 'npick' to not use >r and r>

2008-11-25 05:55:49 -06:00 · 2008-11-25 05:55:49 -06:00 · de95773574
parent 37f991420b
commit de95773574
1 changed files with 73 additions and 68 deletions
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@ -1,68 +1,73 @@
-! Copyright (C) 2007, 2008 Chris Double, Doug Coleman, Eduardo
-! Cavazos, Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences sequences.private namespaces math
-math.ranges combinators macros quotations fry arrays ;
-IN: generalizations
-
-MACRO: nsequence ( n seq -- quot )
-    [
-        [ drop <reversed> ] [ '[ _ _ new-sequence ] ] 2bi
-        [ '[ @ [ _ swap set-nth-unsafe ] keep ] ] reduce
-    ] keep
-    '[ @ _ like ] ;
-
-MACRO: narray ( n -- quot )
-    '[ _ { } nsequence ] ;
-
-MACRO: firstn ( n -- )
-    dup zero? [ drop [ drop ] ] [
-        [ [ '[ [ _ ] dip nth-unsafe ] ] map ]
-        [ 1- '[ [ _ ] dip bounds-check 2drop ] ]
-        bi prefix '[ _ cleave ]
-    ] if ;
-
-MACRO: npick ( n -- )
-    1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ;
-
-MACRO: ndup ( n -- )
-    dup '[ _ npick ] n*quot ;
-
-MACRO: nrot ( n -- )
-    1- dup saver swap [ r> swap ] n*quot append ;
-
-MACRO: -nrot ( n -- )
-    1- dup [ swap >r ] n*quot swap restorer append ;
-
-MACRO: ndrop ( n -- )
-    [ drop ] n*quot ;
-
-: nnip ( n -- )
-    swap >r ndrop r> ; inline
-
-MACRO: ntuck ( n -- )
-    2 + [ dupd -nrot ] curry ;
-
-MACRO: nrev ( n -- quot )
-    1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ;
-
-MACRO: ndip ( quot n -- )
-    dup saver -rot restorer 3append ;
-
-MACRO: nslip ( n -- )
-    dup saver [ call ] rot restorer 3append ;
-
-MACRO: nkeep ( n -- )
-    [ ] [ 1+ ] [ ] tri
-    '[ [ _ ndup ] dip _ -nrot _ nslip ] ;
-
-MACRO: ncurry ( n -- )
-    [ curry ] n*quot ;
-
-MACRO: nwith ( n -- )
-    [ with ] n*quot ;
-
-MACRO: napply ( n -- )
-    2 [a,b]
-    [ [ 1- ] keep '[ _ ntuck _ nslip ] ]
-    map concat >quotation [ call ] append ;
+! Copyright (C) 2007, 2008 Chris Double, Doug Coleman, Eduardo
+! Cavazos, Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel sequences sequences.private namespaces math
+math.ranges combinators macros quotations fry arrays ;
+IN: generalizations
+
+MACRO: nsequence ( n seq -- quot )
+    [
+        [ drop <reversed> ] [ '[ _ _ new-sequence ] ] 2bi
+        [ '[ @ [ _ swap set-nth-unsafe ] keep ] ] reduce
+    ] keep
+    '[ @ _ like ] ;
+
+MACRO: narray ( n -- quot )
+    '[ _ { } nsequence ] ;
+
+MACRO: firstn ( n -- )
+    dup zero? [ drop [ drop ] ] [
+        [ [ '[ [ _ ] dip nth-unsafe ] ] map ]
+        [ 1- '[ [ _ ] dip bounds-check 2drop ] ]
+        bi prefix '[ _ cleave ]
+    ] if ;
+
+: npick-wrap ( quot n -- quot )
+    dup 1 >
+        [ swap '[ _ dip swap ] swap 1 - npick-wrap ]
+        [ drop ]
+    if ;
+
+MACRO: npick ( n -- quot ) [ dup ] swap npick-wrap ;
+
+MACRO: ndup ( n -- )
+    dup '[ _ npick ] n*quot ;
+
+MACRO: nrot ( n -- )
+    1- dup saver swap [ r> swap ] n*quot append ;
+
+MACRO: -nrot ( n -- )
+    1- dup [ swap >r ] n*quot swap restorer append ;
+
+MACRO: ndrop ( n -- )
+    [ drop ] n*quot ;
+
+: nnip ( n -- )
+    swap >r ndrop r> ; inline
+
+MACRO: ntuck ( n -- )
+    2 + [ dupd -nrot ] curry ;
+
+MACRO: nrev ( n -- quot )
+    1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ;
+
+MACRO: ndip ( quot n -- )
+    dup saver -rot restorer 3append ;
+
+MACRO: nslip ( n -- )
+    dup saver [ call ] rot restorer 3append ;
+
+MACRO: nkeep ( n -- )
+    [ ] [ 1+ ] [ ] tri
+    '[ [ _ ndup ] dip _ -nrot _ nslip ] ;
+
+MACRO: ncurry ( n -- )
+    [ curry ] n*quot ;
+
+MACRO: nwith ( n -- )
+    [ with ] n*quot ;
+
+MACRO: napply ( n -- )
+    2 [a,b]
+    [ [ 1- ] keep '[ _ ntuck _ nslip ] ]
+    map concat >quotation [ call ] append ;