X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=a4f3d6a8688048fce734ad50b9815b820117cd72;hp=3c1b9da604f4a3aa3be8a607b0a6c7db463b1f75;hb=e4f373b56b1cdc2c086c0b86e5ec45bad784df0e;hpb=3885d0596c6f13f432ecd2c46f87d6477cb773b0

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 3c1b9da..a4f3d6a 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -186,25 +186,16 @@ 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 */
-
             /** what state this node is in */
             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 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;
@@ -214,16 +205,14 @@ class GSS {
                         r.reduce(this, null, null);
             }
 
-            /** FIXME */
             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);
             }
 
 
-            /** FIXME */
             public void queueEmptyReductions() {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))