X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=b4ac23a0a3285023df34427c262e921a9411e241;hb=cd979dfc5968a185c12d6eedc2aa688ef4b0f8b8;hp=2a090b0cc8d9b36593d56586c82e54853cf3e119;hpb=6c04c94d0eff9dc0fd1a0c2c36c8adc18f17d191;p=sbp.git diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java index 2a090b0..b4ac23a 100644 --- a/src/edu/berkeley/sbp/Parser.java +++ b/src/edu/berkeley/sbp/Parser.java @@ -126,7 +126,7 @@ public abstract class Parser { public final int idx = master_state_idx++; private final HashSet hs; - private transient HashMap gotoSetNonTerminals = new HashMap(); + public transient HashMap gotoSetNonTerminals = new HashMap(); private transient TopologicalBag gotoSetTerminals = new TopologicalBag(); private TopologicalBag reductions = new TopologicalBag(); @@ -272,41 +272,6 @@ public abstract class Parser { return zero = position.rewrite(null); } - 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 - public 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