checkpoint harmony

darcs-hash:20060111060854-5007d-1fd3d2cdfba1dc228aea25b2d63b588d67150c21.gz

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 5ec5b07..8869281 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -252,7 +252,6 @@ public abstract class Parser<T extends Token, R> {
         public class Reduction {
             // FIXME: cleanup; almost everything in here could go in either Sequence.Position.getRewrite() or else in GSS.Reduct
             /*private*/ final Position position;
-            private final Forest[] holder;    // to avoid constant reallocation
             public int hashCode() { return position.hashCode(); }
             public boolean equals(Object o) {
                 if (o==null) return false;
@@ -263,7 +262,6 @@ public abstract class Parser<T extends Token, R> {
             }
             public Reduction(Position p) {
                 this.position = p;
-                this.holder = new Forest[position.pos];
             }
             public String toString() { return "[reduce " + position + "]"; }
 
@@ -275,39 +273,41 @@ public abstract class Parser<T extends Token, R> {
             }
 
             public void reduce(GSS.Phase.Node parent) {
-                if (position.pos==0) finish(parent, zero(), parent.phase());
-                else           reduce(parent, position.pos-1, parent.phase());
+                Forest[] holder = new Forest[position.pos];
+                if (position.pos==0) finish(parent, zero(), parent.phase(), holder);
+                else           reduce(parent, position.pos-1, parent.phase(), holder);
             }
 
             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());
+                    finish(onlychild, position.rewrite(parent.phase().getLocation()), parent.phase(), holder);
                 } else {
-                    reduce(onlychild, pos-1, parent.phase());
+                    reduce(onlychild, pos-1, parent.phase(), holder);
                 }
                 holder[pos] = old;
             }
 
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
-            private void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target) {
+            private void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target, Forest[] holder) {
                 Forest old = holder[pos];
                 holder[pos] = parent.pending();
                 if (pos==0) {
                     System.arraycopy(holder, 0, position.holder, 0, holder.length);
                     for(int i=0; i<position.pos; i++) if (position.holder[i]==null) throw new Error("realbad");
                     Forest rex = position.rewrite(target.getLocation());
-                    for(GSS.Phase.Node child : parent.parents()) finish(child, rex, target);
+                    for(GSS.Phase.Node child : parent.parents()) finish(child, rex, target, holder);
                 } else {
-                    for(GSS.Phase.Node child : parent.parents()) reduce(child, pos-1, target);
+                    for(GSS.Phase.Node child : parent.parents()) reduce(child, pos-1, target, holder);
                 }
                 holder[pos] = old;
             }
-            private void finish(GSS.Phase.Node parent, Forest result, GSS.Phase target) {
+            private void finish(GSS.Phase.Node parent, Forest result, GSS.Phase target, Forest[] holder) {
                 State state = parent.state.gotoSetNonTerminals.get(position.owner());
                 if (result==null) throw new Error();
                 if (state!=null)