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 7bba6a6..77464c2 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -116,6 +116,11 @@ class GSS {
             int num = hv.size();
             for(int i=0; i<num; i++) {
                 Node n = reducing_list[i];
+                n.queueEmptyReductions();
+                // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
+            }
+            for(int i=0; i<num; i++) {
+                Node n = reducing_list[i];
                 reducing_list[i] = null;
                 n.queueEmptyReductions();
                 n.queueReductions();
@@ -205,11 +210,16 @@ class GSS {
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
-                for(int i=0; i<where; i++) queueReductions(get(i));
+                for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
+                    if (r.numPop > 1)
+                        r.reduce(this, null, null);
+                for(int i=0; i<where; i++)
+                    queueReductions(get(i), false);
             }
 
             /** FIXME */
-            public void queueReductions(Node n2) {
+            public void queueReductions(Node n2) { queueReductions(n2, true); }
+            public void queueReductions(Node n2, boolean includeLongs) {
                 if (!allqueued) { queueReductions(); return; }
                 Node n = this;
                 for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
@@ -230,7 +240,7 @@ class GSS {
                         if (ret != null) r.reduce(this, n2, ret);
                         else n.cache().put(r, r.reduce(this, n2, null));
                     } else {
-                        r.reduce(this, n2, null);
+                        if (includeLongs) r.reduce(this, n2, null);
                     }
                 }
             }