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 86c93b2..5feba84 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -285,7 +285,7 @@ class GSS {
                     }
                     if (n==null) return;
                     Forest[] holder = new Forest[r.position.pos];
-                    if (r.position.pos==0) r.finish(n, r.zero(), n.phase(), holder);
+                    if (r.position.pos==0) n.finish(r, r.zero(), n.phase(), holder);
                     else                   r.reduce(n, r.position.pos-1, n.phase(), holder);
                 } else {
                     Forest[] holder = new Forest[r.position.pos];
@@ -296,13 +296,21 @@ class GSS {
                     if (pos==0) {
                         System.arraycopy(holder, 0, r.position.holder, 0, holder.length);
                         Forest rex = r.position.rewrite(n.phase().getLocation());
-                        r.finish(n2, rex, n.phase(), holder);
+                        n2.finish(r, rex, n.phase(), holder);
                     } else {
                         r.reduce(n2, 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());
+                if (result==null) throw new Error();
+                if (state0!=null)
+                    target.newNode(this, result, state0, r.position.pos<=0, r);
+            }
+
             public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
 
             private Node(Node parent, Forest pending, State state) {