Merge branch 'master' of git://factorcode.org/git/factor

db4
John Benediktsson 2009-05-12 14:49:44 -07:00
commit 0e2ccdb52c
1 changed files with 6 additions and 6 deletions

View File

@ -11,8 +11,8 @@ MACRO: output>sequence ( quot exemplar -- newquot )
[ dup infer out>> ] dip [ dup infer out>> ] dip
'[ @ _ _ nsequence ] ; '[ @ _ _ nsequence ] ;
: output>array ( quot -- newquot ) MACRO: output>array ( quot -- newquot )
{ } output>sequence ; inline '[ _ { } output>sequence ] ;
MACRO: input<sequence ( quot -- newquot ) MACRO: input<sequence ( quot -- newquot )
[ infer in>> ] keep [ infer in>> ] keep
@ -25,8 +25,8 @@ MACRO: input<sequence-unsafe ( quot -- newquot )
MACRO: reduce-outputs ( quot operation -- newquot ) MACRO: reduce-outputs ( quot operation -- newquot )
[ dup infer out>> 1 [-] ] dip n*quot compose ; [ dup infer out>> 1 [-] ] dip n*quot compose ;
: sum-outputs ( quot -- n ) MACRO: sum-outputs ( quot -- n )
[ + ] reduce-outputs ; inline '[ _ [ + ] reduce-outputs ] ;
MACRO: map-reduce-outputs ( quot mapper reducer -- newquot ) MACRO: map-reduce-outputs ( quot mapper reducer -- newquot )
[ dup infer out>> ] 2dip [ dup infer out>> ] 2dip
@ -37,5 +37,5 @@ MACRO: map-reduce-outputs ( quot mapper reducer -- newquot )
MACRO: append-outputs-as ( quot exemplar -- newquot ) MACRO: append-outputs-as ( quot exemplar -- newquot )
[ dup infer out>> ] dip '[ @ _ _ nappend-as ] ; [ dup infer out>> ] dip '[ @ _ _ nappend-as ] ;
: append-outputs ( quot -- seq ) MACRO: append-outputs ( quot -- seq )
{ } append-outputs-as ; inline '[ _ { } append-outputs-as ] ;