@@ -38,12 +38,15 @@ INSTANCE: fried-callable fried [ [ \ 3curry suffix! ] dip 3 - (ncurry) ] } case ; +: wrap-non-callable ( obj -- quot ) + dup callable? [ ] [ [ call ] curry ] if ; inline + : [ncurry] ( n -- quot ) [ V{ } clone ] dip (ncurry) >quotation ; : [ndip] ( quot n -- quot' ) { - { 0 [ ] } + { 0 [ wrap-non-callable ] } { 1 [ \ dip [ ] 2sequence ] } { 2 [ \ 2dip [ ] 2sequence ] } { 3 [ \ 3dip [ ] 2sequence ] } basis/fry/fry.factor @@ -389,7 +389,7 @@ M:: integer lambda-method-forget-test ( a -- b ) a ; eval( -- ) call ] [ error>> >r/r>-in-fry-error? ] must-fail-with -:: (funny-macro-test) ( obj quot -- ? ) obj { quot } 1&& ; inline +:: (funny-macro-test) ( obj quot -- ? ) obj { [ quot call ] } 1&& ; inline : funny-macro-test ( n -- ? ) [ odd? ] (funny-macro-test) ; \ funny-macro-test def>> must-infer basis/locals/locals-tests.factor c00b1df581d673d7b35ea97f10bd99b1450ba5e4 Joe Groff arcata@gmail.com http://github.com/slavapestov/factor/commit/4bea896be97e196da87a8c1142e067dbe15f0c8b 4bea896be97e196da87a8c1142e067dbe15f0c8b 2009-11-08T19:00:35-08:00 2009-11-08T19:00:35-08:00 patch up locals fry tests 973fca7b511de3dd3bb869278fb1e3100db4b823 Joe Groff arcata@gmail.com