steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sequences: minor formatting improvements.

db4
John Benediktsson 2012-09-05 16:21:47 -07:00
parent 6f66173784
commit 1a86af31f1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/sequences/sequences.factor
View File

@ -139,16 +139,13 @@ INSTANCE: iota immutable-sequence
[ 0 swap set-nth-unsafe ] keep ; inline [ 0 swap set-nth-unsafe ] keep ; inline
: (2sequence) ( obj1 obj2 seq -- seq ) : (2sequence) ( obj1 obj2 seq -- seq )
[ 1 swap set-nth-unsafe ] keep [ 1 swap set-nth-unsafe ] keep (1sequence) ; inline
(1sequence) ; inline
: (3sequence) ( obj1 obj2 obj3 seq -- seq ) : (3sequence) ( obj1 obj2 obj3 seq -- seq )
[ 2 swap set-nth-unsafe ] keep [ 2 swap set-nth-unsafe ] keep (2sequence) ; inline
(2sequence) ; inline
: (4sequence) ( obj1 obj2 obj3 obj4 seq -- seq ) : (4sequence) ( obj1 obj2 obj3 obj4 seq -- seq )
[ 3 swap set-nth-unsafe ] keep [ 3 swap set-nth-unsafe ] keep (3sequence) ; inline
(3sequence) ; inline
PRIVATE> PRIVATE>
@ -992,7 +989,8 @@ M: object sum 0 [ + ] binary-reduce ; inline
: map-sum ( ... seq quot: ( ... elt -- ... n ) -- ... n ) : map-sum ( ... seq quot: ( ... elt -- ... n ) -- ... n )
[ 0 ] 2dip [ dip + ] curry [ swap ] prepose each ; inline [ 0 ] 2dip [ dip + ] curry [ swap ] prepose each ; inline
: count ( ... seq quot: ( ... elt -- ... ? ) -- ... n ) [ 1 0 ? ] compose map-sum ; inline : count ( ... seq quot: ( ... elt -- ... ? ) -- ... n )
[ 1 0 ? ] compose map-sum ; inline
: cartesian-each ( ... seq1 seq2 quot: ( ... elt1 elt2 -- ... ) -- ... ) : cartesian-each ( ... seq1 seq2 quot: ( ... elt1 elt2 -- ... ) -- ... )
[ with each ] 2curry each ; inline [ with each ] 2curry each ; inline