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 3c1b9da..5847d6b 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -186,8 +186,6 @@ class GSS {
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
             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 */
 
             /** the set of nodes to which there is an edge starting at this node */
             //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
 

@@ -197,14 +195,10 @@ 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; }
 
             /** 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; }
 
             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;
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;

@@ -214,7 +208,6 @@ class GSS {
                         r.reduce(this, null, null);
             }
 
                         r.reduce(this, null, null);
             }
 

-            /** FIXME */

             public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
                 for(Parser.Table.Reduction r : state.getReductions(token))
             public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
                 for(Parser.Table.Reduction r : state.getReductions(token))

@@ -223,7 +216,6 @@ class GSS {
             }
 
 
             }
 
 

-            /** FIXME */

             public void queueEmptyReductions() {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
             public void queueEmptyReductions() {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))