Maing vocabs.hierarchy use sets; modifying alias analysis's use of sets

diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
index 23e46f169ba8e75fa4cd898e9b878feaf4f1a2e5..24433ad594f75ff9742e166082b3c54c1d226a9a 100644 (file)
--- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor
+++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
@@ -298,7 +298,7 @@ SYMBOL: live-stores
     histories get
     values [
         values [ [ store? ] filter [ insn#>> ] map ] map concat
-    ] map concat HS{ } set-like
+    ] map concat fast-set
     live-stores set ;
 
 GENERIC: eliminate-dead-stores* ( insn -- insn' )

diff --git a/basis/vocabs/hierarchy/hierarchy.factor b/basis/vocabs/hierarchy/hierarchy.factor
index b840b5ab9dfe96d83ff8dcb22a18fad77c8e5117..986091a543a0bc7d4b5eebbfc92ba8ef56d91270 100644 (file)
--- a/basis/vocabs/hierarchy/hierarchy.factor
+++ b/basis/vocabs/hierarchy/hierarchy.factor
@@ -65,8 +65,8 @@ PRIVATE>
     #! Hack.\r
     [ vocab-prefix? ] partition\r
     [\r
-        [ vocab-name ] map unique\r
-        '[ name>> _ key? not ] filter\r
+        [ vocab-name ] map fast-set\r
+        '[ name>> _ in? not ] filter\r
         convert-prefixes\r
     ] keep\r
     append ;\r