sequences.extras: cleanup reduce's a little.

db4
John Benediktsson 2013-04-25 20:48:04 -07:00
parent 17415b3525
commit 7d27d64f36
1 changed files with 9 additions and 8 deletions

View File

@ -6,16 +6,17 @@ IN: sequences.extras
: reduce1 ( seq quot -- result ) [ unclip ] dip reduce ; inline : reduce1 ( seq quot -- result ) [ unclip ] dip reduce ; inline
:: reduce-r ( list identity quot: ( obj1 obj2 -- obj ) -- result ) :: reduce-r ( seq identity quot: ( obj1 obj2 -- obj ) -- result )
list empty? seq [ identity ] [
[ identity ] unclip [ identity quot reduce-r ] [ quot call ] bi*
[ list rest identity quot reduce-r list first quot call ] if ; ] if-empty ; inline recursive
inline recursive
! Quot must have static stack effect, unlike "reduce" ! Quot must have static stack effect, unlike "reduce"
:: reduce* ( seq id quot -- result ) seq :: reduce* ( seq identity quot: ( prev elt -- next ) -- result )
[ id ] seq [ identity ] [
[ unclip id swap quot call( prev elt -- next ) quot reduce* ] if-empty ; inline recursive unclip identity swap quot call( prev elt -- next )
quot reduce*
] if-empty ; inline recursive
:: combos ( list1 list2 -- result ) :: combos ( list1 list2 -- result )
list2 [ [ 2array ] curry list1 swap map ] map concat ; list2 [ [ 2array ] curry list1 swap map ] map concat ;