int num = hv.size();
for(int i=0; i<num; i++) {
Node n = reducing_list[i];
+ n.queueEmptyReductions();
+ // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
+ }
+ for(int i=0; i<num; i++) {
+ Node n = reducing_list[i];
reducing_list[i] = null;
n.queueEmptyReductions();
n.queueReductions();
public final Parser.Table.State state;
/** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
- public final Phase phase = Phase.this;
+ public Phase phase() { return Phase.this; }
public HashMap<Parser.Table.Reduction,Forest> cache() {
return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
if (allqueued) return;
allqueued = true;
int where = parents().size();
- for(int i=0; i<where; i++) queueReductions(get(i));
+ for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
+ if (r.numPop >= 1)
+ r.reduce(this, null, null);
}
/** FIXME */
- public void queueReductions(Node n2) {
+ public void queueReductions(Node n2) { queueReductions(n2, true); }
+ public void queueReductions(Node n2, boolean includeLongs) {
if (!allqueued) { queueReductions(); return; }
Node n = this;
for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
if (r.numPop <= 0) continue;
if (r.numPop == 1) {
Forest ret = n.cache().get(r);
- if (ret != null) r.reduce(n, n2, n.phase, ret);
- else n.cache().put(r, r.reduce(n, n2, n.phase, null));
+ if (ret != null) r.reduce(this, n2, ret);
+ else n.cache().put(r, r.reduce(this, n2, null));
} else {
- r.reduce(n, n2, Phase.this, null);
+ r.reduce(this, n2, null);
}
}
}
if (reducing)
for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
if (r.numPop==0)
- r.reduce(this, null, this.phase, r.zero());
+ r.reduce(this, null, r.zero());
}
private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {