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 1d401a5..74cbb48 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -73,23 +73,22 @@ class GSS {
          *  @param fromEmptyReduction true iff this node is being created as a result of a reduction of length zero (see GRMLR paper)
          *  @param start              the earliest part of the input contributing to this node (used to make merging decisions)
          */
-        public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
-            Node p = hash.get(code(state, start));
-            if (p != null)  newNode2(p, parent, pending, state, fromEmptyReduction, start);
-            else            newNode3(parent, pending, state, fromEmptyReduction, start);
+        public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
+            Node p = hash.get(code(state, parent==null?null:parent.phase()));
+            if (p != null)  newNode2(p, parent, pending, state, fromEmptyReduction);
+            else            newNode3(parent, pending, state, fromEmptyReduction);
         }
-        private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
+        private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
             p.holder.merge(pending);
             if (p.parents().contains(parent)) return;
-            p.addParent(parent, fromEmptyReduction);
+            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) {
+        private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
             do {
                 if (token != null && state.canShift(token)) break;
                 if (state.isAccepting()) break;
                 if (token==null) break;
-                int count = 0;
-                Parser.Table.Reduction r = null;
                 if (!state.canReduce(token)) return;
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
@@ -97,7 +96,7 @@ class GSS {
                 //return;
             } while(false);
 
-            Node n = new Node(parent, pending, state, start);  // ALLOC
+            Node n = new Node(parent, pending, state);  // ALLOC
             n.queueEmptyReductions();
             if (!fromEmptyReduction) n.queueReductions(parent);
         }
@@ -124,7 +123,7 @@ class GSS {
         }
 
         public void invoke(Parser.Table.State st, Forest result, Node n) {
-            next.newNode(n, result, st, true, this);
+            next.newNode(n, result, st, true);
         }
         private Phase next = null;
 
@@ -184,12 +183,6 @@ class GSS {
         /** a node in the GSS */
         public final class Node extends FastSet<Node> implements Invokable<Parser.Table.Reduction, Node, Node> {
 
-            public void addParent(Node parent, boolean fromEmptyReduction) {
-                if (parents().contains(parent)) return;
-                parents().add(parent);
-                if (this!=parent && !fromEmptyReduction) queueReductions(parent);
-            }
-
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
@@ -207,21 +200,11 @@ class GSS {
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
-                /*
-                for(Parser.Table.Reduction r : state.getReductions(token))
-                    if (r.numPop > 0)
-                        r.reduce(this);
-                */
                 state.invokeReductions(token, this, this, null);
             }
 
             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);
-                */
                 state.invokeReductions(token, this, this, n2);
             }
 
@@ -231,26 +214,19 @@ class GSS {
                     return;
                 }
                 if (r.numPop==0) return;
-                if (n2==null) {
-                    r.reduce(n);
-                } else {
-                    r.reduce(n, n2);
-                }
+                if (n2==null) r.reduce(n);
+                else          r.reduce(n, n2);
             }
             public void queueEmptyReductions() {
                 if (!reducing) return;
-                /*
-                  for(Parser.Table.Reduction r : state.getReductions(token))
-                        if (r.numPop==0)
-                            r.reduce(this);
-                */
                 state.invokeReductions(token, this, null, null);
             }
 
-            private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
+            private Node(Node parent, Forest pending, Parser.Table.State state) {
                 this.state = state;
+                Phase start = parent==null ? null : parent.phase();
                 if (pending != null) this.holder().merge(pending);
-                if (parent != null) parents().add(parent);
+                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++;
@@ -269,6 +245,6 @@ class GSS {
 
     /** this is something of a hack right now */
     private static long code(Parser.Table.State state, Phase start) {
-        return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
+        return (((long)state.idx) << 32) | (start==null ? 0 : (start.pos+1));
     }
 }