X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=77464c25b4f96d28087c836b8d1f99a6bdb27afb;hp=0b6064d633bc02db04426ba46d91379838df8ed4;hb=c263c1e02119917a9d63ab14db9711c7d1cb4d9d;hpb=72cc02d0f08922a98b9f2139e814b6c33b275a43

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 0b6064d..77464c2 100644
--- 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();
@@ -191,7 +196,7 @@ class GSS {
             public final Parser.Table.State state;
 
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
-            public final Phase phase = Phase.this;
+            public Phase phase() { return Phase.this; }
 
             public  HashMap<Parser.Table.Reduction,Forest> cache() {
                 return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
@@ -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)) {
@@ -227,10 +237,10 @@ class GSS {
                     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));
+                        if (ret != null) r.reduce(this, n2, ret);
+                        else n.cache().put(r, r.reduce(this, n2, null));
                     } else {
-                        r.reduce(n, n2, Phase.this, null);
+                        if (includeLongs) r.reduce(this, n2, null);
                     }
                 }
             }
@@ -241,7 +251,7 @@ class GSS {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
                         if (r.numPop==0)
-                            r.reduce(this, null, this.phase, r.zero());
+                            r.reduce(this, null, r.zero());
             }
 
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {