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();
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);
+ for(int i=0; i<where; i++)
+ queueReductions(get(i), false);
}
/** 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 (ret != null) r.reduce(this, n2, ret);
else n.cache().put(r, r.reduce(this, n2, null));
} else {
- r.reduce(this, n2, null);
+ if (includeLongs) r.reduce(this, n2, null);
}
}
}
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, Forest rex) {
- return reduce(parent, numPop-1, rex, onlychild, parent.phase());
+ 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