X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=645fa8ff6f290d7750f382b7b04f0c7141158307;hp=5847d6ba32a261709b3629a2e3653e5232b037c1;hb=c4431d19cc5ddaae29d22c8c56366b53b0bad352;hpb=69965bfd571a733f573e2adc7fae06a653c83cae;ds=sidebyside

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 5847d6b..645fa8f 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -92,8 +92,7 @@ class GSS {
                 if (token==null) break;
                 int count = 0;
                 Parser.Table.Reduction r = null;
-                for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
-                if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+                if (!state.hasReductions(token)) return;
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
                 //r.reduce(pending, parent, null, Phase.this, null);
@@ -186,9 +185,6 @@ class GSS {
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
-            /** the set of nodes to which there is an edge starting at this node */
-            //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
-
             /** what state this node is in */
             public final Parser.Table.State state;
 
@@ -205,14 +201,14 @@ class GSS {
                 int where = parents().size();
                 for(Parser.Table.Reduction r : state.getReductions(token))
                     if (r.numPop >= 1)
-                        r.reduce(this, null, null);
+                        r.reduce(this);
             }
 
             public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
                 for(Parser.Table.Reduction r : state.getReductions(token))
                     if (r.numPop > 0)
-                        r.reduce(this, n2, null);
+                        r.reduce(this, n2);
             }
 
 
@@ -220,13 +216,13 @@ class GSS {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
                         if (r.numPop==0)
-                            r.reduce(this, null, r.zero());
+                            r.reduce(this);
             }
 
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
                 this.state = state;
                 if (pending != null) this.holder().merge(pending);
-                if (parent != null) parents().add(parent, true);
+                if (parent != null) parents().add(parent);
                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;