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 8165ccd..6db929b 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -27,6 +27,8 @@ class GSS {
 
     public GSS() { }
 
+    private Phase.Node[] reducing_list = null;
+
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
     public class Phase {
 
@@ -78,8 +80,8 @@ class GSS {
         }
         private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             p.holder.merge(pending);
-            if (p.parents.contains(parent)) return;
-            p.parents.add(parent, true);
+            if (p.parents().contains(parent)) return;
+            p.parents().add(parent, true);
             if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
         private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
@@ -90,7 +92,7 @@ class GSS {
                 int count = 0;
                 Parser.Table.Reduction r = null;
                 for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
-                //if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+                if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
                 //r.reduce(pending, parent, null, Phase.this, null);
@@ -107,10 +109,17 @@ class GSS {
         /** perform all reduction operations */
         public void reduce() {
             reducing = true;
-            HashSet<Phase.Node> s = new HashSet<Phase.Node>();
-            s.addAll(hash.values());
-            for(Phase.Node n : s) n.queueEmptyReductions();
-            for(Phase.Node n : s) n.queueReductions();
+            if (reducing_list==null || reducing_list.length < hash.size())
+                reducing_list = new Phase.Node[hash.size() * 4];
+            Collection<Node> hv = hash.values();
+            hv.toArray(reducing_list);
+            int num = hv.size();
+            for(int i=0; i<num; i++) {
+                Node n = reducing_list[i];
+                reducing_list[i] = null;
+                n.queueEmptyReductions();
+                n.queueReductions();
+            }
         }
 
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
@@ -163,17 +172,19 @@ class GSS {
         // GSS Nodes //////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node {
+        public final class Node extends FastSet<Node> {
 
             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 */
+            //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 final Phase phase = Phase.this;
 
@@ -181,24 +192,19 @@ class GSS {
                 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 parents; }
+            public  FastSet<Node> parents() { return this; }
 
             /** FIXME */
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;
-                FastSet<Node> h = new FastSet<Node>();
-                for(Node n : parents) h.add(n);
-                for(Node n : h) queueReductions(n);
+                int where = parents().size();
+                for(int i=0; i<where; i++) queueReductions(get(i));
             }
 
-            private boolean allqueued = false;
-            private HashSet<Node> queued = new HashSet<Node>();
             /** FIXME */
             public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
-                if (queued.contains(n2)) return;
-                queued.add(n2);
                 Node n = this;
                 for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
                     
@@ -242,7 +248,7 @@ class GSS {
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
                 this.state = state;
                 if (pending != null) this.holder().merge(pending);
-                if (parent != null) parents.add(parent, true);
+                if (parent != null) parents().add(parent, true);
                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;