basis: use harvest-values

diff --git a/basis/compiler/cfg/representations/selection/selection.factor b/basis/compiler/cfg/representations/selection/selection.factor
index 11751137745ffcad12a8019fa382fddd105127cb..b498ce29f75dca3bcd1ac23c43eb73c3f81474cc 100644 (file)
--- a/basis/compiler/cfg/representations/selection/selection.factor
+++ b/basis/compiler/cfg/representations/selection/selection.factor
@@ -128,7 +128,7 @@ M: vreg-insn compute-insn-costs
     ] each-basic-block ;
 
 : minimize-costs ( costs -- representations )
-    [ nip assoc-empty? ] assoc-reject
+    harvest-values
     [ >alist alist-min first ] assoc-map ;
 
 : compute-representations ( cfg -- )

diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor
index 2f8725cd180b6077d1d3f98ef4a4d9f398353839..f985b0e2346bff51195a25d3de809e32d03d4412 100644 (file)
--- a/basis/regexp/disambiguate/disambiguate.factor
+++ b/basis/regexp/disambiguate/disambiguate.factor
@@ -66,7 +66,7 @@ TUPLE: parts in out ;
         dup new-transitions '[
             [
                 _ swap '[ _ get-transitions ] assoc-map
-                [ nip empty? ] assoc-reject
+                harvest-values
             ] preserving-epsilon
         ] assoc-map
     ] change-transitions ;