sequences.extras: using sift.

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 992deb521bf1db2297144fae9fa7594e22bf5d77..9e119751358c4c645185bcd28e7788ad6f89e3e6 100644 (file)
--- 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 ed6dfe02c80b61a3f846268fc20d995e220bf374..14c6ff3b4031b8269b55fc5396a5e9179b5ad112 100644 (file)
--- a/unmaintained/adsoda/adsoda.factor
+++ b/unmaintained/adsoda/adsoda.factor
@@ -212,14 +212,14 @@ TUPLE: face { halfspace array }
 : intersections-into-faces ( face -- faces )\r
     clone dup  \r
     adjacent-faces>> [ intersection-into-face ] with map \r
-    [ ] filter ;\r
+    sift ;\r
 \r
 : (face-silhouette) ( face -- faces )\r
     clone dup adjacent-faces>>\r
     [   backface?\r
         [ intersection-into-silhouette-face ] [ 2drop f ]  if  \r
     ] with map \r
-    [ ] filter\r
+    sift\r
 ; inline\r
 \r
 : face-silhouette ( face -- faces )     \r
@@ -290,7 +290,7 @@ TUPLE: solid dimension silhouettes
    ! find-adjacencies \r
    faces>> { } \r
    [ face-silhouette append ] reduce\r
-   [ ] filter \r
+   sift\r
    <solid> \r
         swap >>faces\r
         over dimension>> >>dimension \r
@@ -372,7 +372,7 @@ TUPLE: solid dimension silhouettes
   ensure-adjacencies\r
     [ color>> ] [ faces>> ] bi [ 3array  ] dip\r
     [ face-project ] with map \r
-    [ ] filter \r
+    sift\r
     [ ensure-adjacencies ] map\r
 ;\r
 \r