using map-reduce instead of unclip reduce.

diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor
index 9acdc88be32f9b4204126a92c76991b7db8d7cfb..cb5eb954ee8d0f7a9f9d5900918f350ec1c275d2 100644 (file)
--- a/basis/regexp/disambiguate/disambiguate.factor
+++ b/basis/regexp/disambiguate/disambiguate.factor
@@ -27,7 +27,7 @@ TUPLE: parts in out ;
     [ nip in>> ] [ out>> append ] 2bi parts boa ;
 
 : intersection ( seq -- elts/f )
-    [ f ] [ unclip [ intersect ] reduce ] if-empty ;
+    [ f ] [ [ ] [ intersect ] map-reduce ] if-empty ;
 
 : meaningful-integers ( partition table -- integers )
     [ [ in>> ] [ out>> ] bi ] dip

diff --git a/extra/units/units.factor b/extra/units/units.factor
index 6bc2242074c836cbbeb071f8204f3e9750d266cf..050956109c3176f3eedc9ddb615f39dd19a4976f 100644 (file)
--- a/extra/units/units.factor
+++ b/extra/units/units.factor
@@ -86,11 +86,11 @@ M: dimensions-not-equal summary drop "Dimensions do not match" ;
 
 : d-product ( v -- d ) 1 scalar [ d* ] reduce ;
 
-: d-sum ( v -- d ) unclip-slice [ d+ ] reduce ;
+: d-sum ( v -- d ) [ ] [ d+ ] map-reduce ;
 
-: d-infimum ( v -- d ) unclip-slice [ d-min ] reduce ;
+: d-infimum ( v -- d ) [ ] [ d-min ] map-reduce ;
 
-: d-supremum ( v -- d ) unclip-slice [ d-max ] reduce ;
+: d-supremum ( v -- d ) [ ] [ d-max ] map-reduce ;
 
 \ d+ [ d- ] [ d- ] define-math-inverse
 \ d- [ d+ ] [ d- ] define-math-inverse

diff --git a/extra/yaml/yaml.factor b/extra/yaml/yaml.factor
index 6eeaed345623902e498c4f5a04c30a842be59fc7..a83b883f083af6c5fd6a3bbbb4ddc0a3ccc5faca 100644 (file)
--- a/extra/yaml/yaml.factor
+++ b/extra/yaml/yaml.factor
@@ -213,7 +213,7 @@ M: assoc (deref-aliases)
      [ [ (deref-aliases) ] bi-curry@ bi ] with2 assoc-map! ;
 
 : merge-values ( seq -- assoc )
-    reverse unclip [ assoc-union ] reduce ;
+    reverse [ ] [ assoc-union ] map-reduce ;
 GENERIC: merge-value ( assoc value -- assoc' )
 M: sequence merge-value merge-values merge-value ;
 M: assoc merge-value over assoc-diff assoc-union! ;