checkpoint harmony

darcs-hash:20060111073610-5007d-70be984e902dc0fb7c1357d569ff931f5feeb66d.gz

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 6316aad..86c93b2 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -288,7 +288,19 @@ class GSS {
                     if (r.position.pos==0) r.finish(n, r.zero(), n.phase(), holder);
                     else                   r.reduce(n, r.position.pos-1, n.phase(), holder);
                 } else {
-                    r.reduce(n, n2);
+                    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 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());
+                        r.finish(n2, rex, n.phase(), holder);
+                    } else {
+                        r.reduce(n2, pos-1, n.phase(), holder);
+                    }
+                    holder[pos] = old;
                 }
             }
             public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 2a090b0..ee7a6f5 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -273,18 +273,6 @@ public abstract class Parser<T extends Token, R> {
             }
 
             public void reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
-                Forest[] holder = new Forest[position.pos];
-                if (position.pos<=0) throw new Error("called wrong form of reduce()");
-                int pos = position.pos-1;
-                Forest old = holder[pos];
-                holder[pos] = parent.pending();
-                if (pos==0) {
-                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
-                    finish(onlychild, position.rewrite(parent.phase().getLocation()), parent.phase(), holder);
-                } else {
-                    reduce(onlychild, pos-1, parent.phase(), holder);
-                }
-                holder[pos] = old;
             }
 
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else