checkpoint

[sbp.git] / src / edu / berkeley / sbp / GSS.java

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 26b6448..04a6310 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -122,11 +122,10 @@ class GSS {
             reducing = true;
             HashSet<Phase.Node> s = new HashSet<Phase.Node>();
             s.addAll(hash.values());
+            //while(pendingReduct.size()>0)
+            //pendingReduct.removeFirst().go();
             for(Phase.Node n : s) n.queueEmptyReductions();
             for(Phase.Node n : s) n.queueReductions();
-            while(pendingReduct.size()>0)
-                //pendingReduct.iterator().next().go();
-                pendingReduct.removeFirst().go();
         }
 
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
@@ -207,9 +206,12 @@ class GSS {
                     queueReductions(n2);
             }
 
+            private HashSet<Node> queued = new HashSet<Node>();
             /** FIXME */
             public void queueReductions(Node n2) {
-                newReduct(this, n2, null);
+                if (queued.contains(n2)) return;
+                queued.add(n2);
+                new Reduct(this, n2, null).go();
             }
 
 
@@ -232,10 +234,6 @@ class GSS {
             }
         }
 
-        public void newReduct(Node n, Node n2, Parser.Table.Reduction r) {
-            new Reduct(n, n2, r)/*.go()*/;
-        }
-
         // Forest / Completed Reductions //////////////////////////////////////////////////////////////////////////////
 
         /** a pending or completed reduction */
@@ -265,7 +263,7 @@ class GSS {
                 reductions.add(this);
                 pendingReduct.addFirst(this);
                 pendingReductions++;
-                //if (reducing) go();
+                go();
             }
 
             /** perform the reduction */
@@ -295,17 +293,15 @@ class GSS {
                         // children wind up being children of the newly
                         // created node rather than part of the popped
                         // sequence
-                        
+                        if (r.numPop <= 0) continue;
                         if (r.numPop == 1) {
                             Forest ret = n.cache().get(r);
                             if (ret != null) r.reduce(n, n2, n.phase, ret);
                             else n.cache().put(r, r.reduce(n, n2, n.phase, null));
+                        } else {
+                            r.reduce(n, n2, Phase.this, null);
                         }
                     }
-                    for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-                        if (r.numPop <= 1) continue;
-                        r.reduce(n, n2, Phase.this, null);
-                    }
                 } else if (r.numPop != 1) {
                     r.reduce(n, n2, Phase.this, null);
                 }