From a7b782542d304fe60607cec2de3dc4456c645a94 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 6 Dec 2014 21:20:24 -0800 Subject: [PATCH] sequences.extras: using sift. --- extra/sequences/extras/extras.factor | 2 +- unmaintained/adsoda/adsoda.factor | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index 992deb521b..9e11975135 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -25,7 +25,7 @@ IN: sequences.extras : find-all ( seq quot: ( elt -- ? ) -- elts ) [ [ length iota ] keep ] dip [ dupd call( a -- ? ) [ 2array ] [ 2drop f ] if ] curry - 2map [ ] filter ; inline + 2map sift ; inline : reduce-from ( ... seq identity quot: ( ... prev elt -- ... next ) i -- ... result ) [ swap ] 2dip each-from ; inline diff --git a/unmaintained/adsoda/adsoda.factor b/unmaintained/adsoda/adsoda.factor index ed6dfe02c8..14c6ff3b40 100644 --- a/unmaintained/adsoda/adsoda.factor +++ b/unmaintained/adsoda/adsoda.factor @@ -212,14 +212,14 @@ TUPLE: face { halfspace array } : intersections-into-faces ( face -- faces ) clone dup adjacent-faces>> [ intersection-into-face ] with map - [ ] filter ; + sift ; : (face-silhouette) ( face -- faces ) clone dup adjacent-faces>> [ backface? [ intersection-into-silhouette-face ] [ 2drop f ] if ] with map - [ ] filter + sift ; inline : face-silhouette ( face -- faces ) @@ -290,7 +290,7 @@ TUPLE: solid dimension silhouettes ! find-adjacencies faces>> { } [ face-silhouette append ] reduce - [ ] filter + sift swap >>faces over dimension>> >>dimension @@ -372,7 +372,7 @@ TUPLE: solid dimension silhouettes ensure-adjacencies [ color>> ] [ faces>> ] bi [ 3array ] dip [ face-project ] with map - [ ] filter + sift [ ensure-adjacencies ] map ;