From cf79dc4646395e3a910bc7520a130512d7c4f50e Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 13 Jul 2008 19:55:42 -0500 Subject: [PATCH] generalizations no longer needs locals --- extra/generalizations/generalizations.factor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extra/generalizations/generalizations.factor b/extra/generalizations/generalizations.factor index 99fa8795ae..e4d5249a30 100755 --- a/extra/generalizations/generalizations.factor +++ b/extra/generalizations/generalizations.factor @@ -1,8 +1,8 @@ ! 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 locals arrays ; +USING: kernel sequences sequences.private namespaces math +math.ranges combinators macros quotations fry arrays ; IN: generalizations MACRO: narray ( n -- quot ) @@ -38,7 +38,7 @@ MACRO: ntuck ( n -- ) 2 + [ dupd -nrot ] curry ; MACRO: nrev ( n -- quot ) - 1 [a,b] [ '[ , -nrot ] ] map concat ; + 1 [a,b] [ ] [ '[ @ , -nrot ] ] reduce ; MACRO: ndip ( quot n -- ) dup saver -rot restorer 3append ; @@ -50,11 +50,11 @@ MACRO: nkeep ( n -- ) [ ] [ 1+ ] [ ] tri '[ [ , ndup ] dip , -nrot , nslip ] ; -MACRO: ncurry ( n -- ) [ curry ] n*quot ; +MACRO: ncurry ( n -- ) + [ curry ] n*quot ; -MACRO:: nwith ( quot n -- ) - [let | n' [ n 1+ ] | - [ n' -nrot [ n' nrot quot call ] n ncurry ] ] ; +MACRO: nwith ( n -- ) + [ with ] n*quot ; MACRO: napply ( n -- ) 2 [a,b]