checkpoint harmony

[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 5feba84..becea95 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -3,7 +3,6 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Sequence.Position;
 import edu.berkeley.sbp.Parser.Table.State;
-import edu.berkeley.sbp.Parser.Table.Reduction;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
@@ -87,9 +86,9 @@ class GSS {
             if (p != null)  return newNode2(p, parent, pending, state, fromEmptyReduction);
             else            return newNode3(parent, pending, state, fromEmptyReduction);
         }
-        public void newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+        public void newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
             int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos;
-            Sequence owner = reduction==null ? null : reduction.position.owner();
+            Sequence owner = reduction==null ? null : reduction.owner();
             if (reduction!=null) {
                 if (inhibited.contains(pos, owner)) return;
                 if (owner.needs != null)
@@ -154,14 +153,14 @@ class GSS {
                     inhibited.remove(p, s2);
         }
 
-        public void inhibit(Reduction r, int p) {
-            if (r.position.owner().hated == null) return;
+        public void inhibit(Position r, int p) {
+            if (r.owner().hated == null) return;
             // remember that dead states are still allowed to shift -- just not allowed to reduce
             boolean reset = false;
-            for(Sequence seq : r.position.owner().hated) {
+            for(Sequence seq : r.owner().hated) {
                 if (performed.contains(p,seq)) {
                     uninhibit(p, seq);
-                    //System.out.println("\nresetting due to " + r.position.owner() + " killing " + seq);
+                    //System.out.println("\nresetting due to " + r.owner() + " killing " + seq);
                     //inhibited.clear();
                     inhibited.add(p, seq);
                     //inhibited = new HashMapBag<Integer,Sequence>();
@@ -234,8 +233,8 @@ class GSS {
             Forest pending;
             State state;
             boolean fromEmptyReduction;
-            Reduction reduction;
-            public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+            Position reduction;
+            public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
                 waits++;
                 this.parent = parent;
                 this.pending = pending;
@@ -252,7 +251,7 @@ class GSS {
         // Node /////////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> implements Invokable<Reduction, Node, Node> {
+        public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node> {
 
             private Forest.Ref holder = null;
             private boolean allqueued = false;
@@ -277,38 +276,52 @@ class GSS {
                 else            state.invokeReductions(token, this, this, n2);
             }
 
-            public final void invoke(Reduction r, Node n, Node n2) {
-                if (n==null || n2==null || r.position.pos==0) {
-                    if (r.position.pos==0) {
+            public final void invoke(Position r, Node n, Node n2) {
+                if (n==null || n2==null || r.pos==0) {
+                    if (r.pos==0) {
                         if (n==null) n = this;
                         else return;
                     }
                     if (n==null) return;
-                    Forest[] holder = new Forest[r.position.pos];
-                    if (r.position.pos==0) n.finish(r, r.zero(), n.phase(), holder);
-                    else                   r.reduce(n, r.position.pos-1, n.phase(), holder);
+                    Forest[] holder = new Forest[r.pos];
+                    if (r.pos==0) n.finish(r, r.zero(), n.phase(), holder);
+                    else                   n.reduce(r, r.pos-1, n.phase(), holder);
                 } else {
-                    Forest[] holder = new Forest[r.position.pos];
-                    if (r.position.pos<=0) throw new Error("called wrong form of reduce()");
-                    int pos = r.position.pos-1;
+                    Forest[] holder = new Forest[r.pos];
+                    if (r.pos<=0) throw new Error("called wrong form of reduce()");
+                    int pos = r.pos-1;
                     Forest old = holder[pos];
                     holder[pos] = n.pending();
                     if (pos==0) {
-                        System.arraycopy(holder, 0, r.position.holder, 0, holder.length);
-                        Forest rex = r.position.rewrite(n.phase().getLocation());
+                        System.arraycopy(holder, 0, r.holder, 0, holder.length);
+                        Forest rex = r.rewrite(n.phase().getLocation());
                         n2.finish(r, rex, n.phase(), holder);
                     } else {
-                        r.reduce(n2, pos-1, n.phase(), holder);
+                        n2.reduce(r, pos-1, n.phase(), holder);
                     }
                     holder[pos] = old;
                 }
             }
 
-            public void finish(Reduction r, Forest result, GSS.Phase target, Forest[] holder) {
-                State state0 = state.gotoSetNonTerminals.get(r.position.owner());
+            public void reduce(Position r, int pos, GSS.Phase target, Forest[] holder) {
+                Forest old = holder[pos];
+                holder[pos] = this.pending();
+                if (pos==0) {
+                    System.arraycopy(holder, 0, r.holder, 0, holder.length);
+                    for(int i=0; i<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
+                    Forest rex = r.rewrite(target.getLocation());
+                    for(GSS.Phase.Node child : this.parents()) child.finish(r, rex, target, holder);
+                } else {
+                    for(GSS.Phase.Node child : this.parents()) child.reduce(r, pos-1, target, holder);
+                }
+                holder[pos] = old;
+            }
+
+            public void finish(Position r, Forest result, GSS.Phase target, Forest[] holder) {
+                State state0 = state.gotoSetNonTerminals.get(r.owner());
                 if (result==null) throw new Error();
                 if (state0!=null)
-                    target.newNode(this, result, state0, r.position.pos<=0, r);
+                    target.newNode(this, result, state0, r.pos<=0, r);
             }
 
             public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }