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

sequences.extras: adding "filter-map".

db4
John Benediktsson 2012-05-02 11:14:10 -07:00
parent f6398365bd
commit a9a0080ce3
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/sequences/extras/extras-tests.factor
View File

@ -64,3 +64,6 @@ IN: sequences.extras.tests
{ { } } [ { } [ ] [ even? ] map-filter ] unit-test
{ "bcde" } [ "abcd" [ 1 + ] [ drop t ] map-filter ] unit-test
{ { 0 4 16 36 64 } } [ 10 iota [ sq ] [ even? ] { } map-filter-as ] unit-test
{ V{ 0 4 16 36 64 } } [ 10 iota [ even? ] [ sq ] filter-map ] unit-test
{ { 2 6 10 14 18 } } [ 10 iota [ odd? ] [ 2 * ] { } filter-map-as ] unit-test

19
extra/sequences/extras/extras.factor
View File

@ -152,3 +152,22 @@ IN: sequences.extras
: map-harvest ( ... seq quot: ( ... elt -- ... newelt ) -- ... newseq )
[ empty? not ] map-filter ; inline
<PRIVATE
: push-map-if ( ..a elt filter-quot: ( ..a elt -- ..b ? ) map-quot: ( ..a elt -- ..b newelt ) accum -- ..b )
[ keep over ] 2dip [ when ] dip rot [ push ] [ 2drop ] if ; inline
: filter-mapper-for ( filter-quot map-quot exemplar -- quot' vec )
[ length ] keep new-resizable [ [ push-map-if ] 3curry ] keep ; inline
: filter-mapper ( filter-quot map-quot -- quot' vec )
V{ } filter-mapper-for ; inline
PRIVATE>
: filter-map-as ( ... seq filter-quot: ( ... elt -- ... ? ) map-quot: ( ... elt -- ... newelt ) exemplar -- ... newseq )
dup [ filter-mapper-for [ each ] dip ] curry dip like ; inline
: filter-map ( ... seq filter-quot: ( ... elt -- ... ? ) map-quot: ( ... elt -- ... newelt ) -- ... newseq )
pick filter-map-as ; inline