Walk.Follow wf = new Walk.Follow(top.empty(), p.owner(), all_elements, cache);
Reduction red = new Reduction(p);
state.reductions.put(wf.walk(p.owner()), red);
- if (wf.includesEof()) state.eofReductions.add(red, true);
+ if (wf.includesEof()) state.eofReductions.add(red);
}
// if the element following this position is an atom, copy the corresponding
}
*/
- public final int idx = master_state_idx++;
+ public final int idx = master_state_idx++;
private final HashSet<Position> hs;
private transient HashMap<Element,State> gotoSetNonTerminals = new HashMap<Element,State>();
private transient TopologicalBag<Token,State> gotoSetTerminals = new TopologicalBag<Token,State>();
private TopologicalBag<Token,Reduction> reductions = new TopologicalBag<Token,Reduction>();
- private FastSet<Reduction> eofReductions = new FastSet<Reduction>();
+ private HashSet<Reduction> eofReductions = new HashSet<Reduction>();
private TopologicalBag<Token,State> shifts = new TopologicalBag<Token,State>();
private boolean accept = false;
this.holder = new Forest[numPop];
}
public String toString() { return "[reduce " + position + "]"; }
- public Forest reduce(Forest f, GSS.Phase.Node parent, GSS.Phase.Node onlychild, GSS.Phase target, Forest rex) {
- holder[numPop-1] = f;
- return reduce(parent, numPop-2, rex, onlychild, target);
- }
- public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, GSS.Phase target, Forest rex) {
- return reduce(parent, numPop-1, rex, onlychild, target);
+
+ public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {
+ Forest ret = reduce(parent, numPop-1, rex, onlychild, parent.phase());
+ return ret;
}
private Forest zero = null;
// FIXME: this could be more elegant and/or cleaner and/or somewhere else
private Forest reduce(GSS.Phase.Node parent, int pos, Forest rex, GSS.Phase.Node onlychild, GSS.Phase target) {
if (pos>=0) holder[pos] = parent.pending();
- if (pos<=0 && rex==null) {
- System.arraycopy(holder, 0, position.holder, 0, holder.length);
- rex = position.rewrite(target.getLocation());
- }
- if (pos >=0) {
+ if (pos==0) {
+ if (rex==null) {
+ System.arraycopy(holder, 0, position.holder, 0, holder.length);
+ rex = position.rewrite(target.getLocation());
+ }
+ if (onlychild != null)
+ reduce(onlychild, pos-1, rex, null, target);
+ else
+ for(GSS.Phase.Node child : parent.parents())
+ reduce(child, pos-1, rex, null, target);
+ } else if (pos>0) {
if (onlychild != null)
reduce(onlychild, pos-1, rex, null, target);
else
} else {
State state = parent.state.gotoSetNonTerminals.get(position.owner());
if (state!=null)
- target.newNode(parent, rex, state, numPop<=0, parent.phase);
+ target.newNode(parent, rex, state, numPop<=0, parent.phase());
}
return rex;
}