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 77464c2..5847d6b 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -122,7 +122,6 @@ class GSS {
             for(int i=0; i<num; i++) {
                 Node n = reducing_list[i];
                 reducing_list[i] = null;
-                n.queueEmptyReductions();
                 n.queueReductions();
             }
         }
@@ -187,8 +186,6 @@ class GSS {
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
-            private HashMap<Parser.Table.Reduction,Forest> cache = null;
-
             /** the set of nodes to which there is an edge starting at this node */
             //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
 
@@ -198,55 +195,27 @@ class GSS {
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
             public Phase phase() { return Phase.this; }
 
-            public  HashMap<Parser.Table.Reduction,Forest> cache() {
-                return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
-            }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
             public  FastSet<Node> parents() { return this; }
 
-            /** FIXME */
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
-                for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
-                    if (r.numPop > 1)
+                for(Parser.Table.Reduction r : 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) { queueReductions(n2, true); }
-            public void queueReductions(Node n2, boolean includeLongs) {
+            public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
-                Node n = this;
-                for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-                    
-                    // UGLY HACK
-                    // The problem here is that a "reduction of length 1"
-                    // performed twice with different values of n2 needs
-                    // to only create a *single* new result, but must add
-                    // multiple parents to the node holding that result.
-                    // The current reducer doesn't differentiate between
-                    // the next node of an n-pop reduction and the
-                    // ultimate parent of the last pop, so we need to
-                    // cache instances here as a way of avoiding
-                    // recreating them.
-                    if (r.numPop <= 0) continue;
-                    if (r.numPop == 1) {
-                        Forest ret = n.cache().get(r);
-                        if (ret != null) r.reduce(this, n2, ret);
-                        else n.cache().put(r, r.reduce(this, n2, null));
-                    } else {
-                        if (includeLongs) r.reduce(this, n2, null);
-                    }
-                }
+                for(Parser.Table.Reduction r : state.getReductions(token))
+                    if (r.numPop > 0)
+                        r.reduce(this, n2, null);
             }
 
 
-            /** FIXME */
             public void queueEmptyReductions() {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))