From 2025ffe29219d6013cd92f68d1419a12cc5f33f2 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 8 Mar 2013 15:58:16 -0800
Subject: [PATCH] compiler.tree.modular-arithmetic: more use of hash-sets.

---
 .../modular-arithmetic.factor                  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
index 41f1949a66..65a7e889ee 100644
--- a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
+++ b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
@@ -54,19 +54,19 @@ cell 8 = [
 SYMBOL: modular-values
 
 : modular-value? ( value -- ? )
-    modular-values get key? ;
+    modular-values get in? ;
 
 : modular-value ( value -- )
-    modular-values get conjoin ;
+    modular-values get adjoin ;
 
 ! Values which are known to be fixnums.
 SYMBOL: fixnum-values
 
 : fixnum-value? ( value -- ? )
-    fixnum-values get key? ;
+    fixnum-values get in? ;
 
 : fixnum-value ( value -- )
-    fixnum-values get conjoin ;
+    fixnum-values get adjoin ;
 
 GENERIC: compute-modular-candidates* ( node -- )
 
@@ -103,8 +103,8 @@ M: node compute-modular-candidates*
     drop ;
 
 : compute-modular-candidates ( nodes -- )
-    H{ } clone modular-values set
-    H{ } clone fixnum-values set
+    HS{ } clone modular-values set
+    HS{ } clone fixnum-values set
     [ compute-modular-candidates* ] each-node ;
 
 GENERIC: only-reads-low-order? ( node -- ? )
@@ -126,9 +126,9 @@ SYMBOL: changed?
     actually-used-by [ node>> only-reads-low-order? ] all? ;
 
 : (compute-modular-values) ( -- )
-    modular-values get keys [
+    modular-values get members [
         dup only-used-as-low-order?
-        [ drop ] [ modular-values get delete-at changed? on ] if
+        [ drop ] [ modular-values get delete changed? on ] if
     ] each ;
 
 : compute-modular-values ( -- )
@@ -203,6 +203,6 @@ M: node optimize-modular-arithmetic* ;
 
 : optimize-modular-arithmetic ( nodes -- nodes' )
     dup compute-modular-candidates compute-modular-values
-    modular-values get assoc-empty? [
+    modular-values get null? [
         [ optimize-modular-arithmetic* ] map-nodes
     ] unless ;