/** all reductions (pending and completed) */
private HashSet<Phase.Reduct> reductions = new HashSet<Phase.Reduct>(); /* ALLOC */
-
+
/** all nodes, keyed by the value returned by code() */
private HashMap<Long,Phase.Node> hash = new HashMap<Long,Phase.Node>(); /* ALLOC */
/** the number of pending reductions */
private int pendingReductions = 0;
private int totalReductions = 0;
- private HashSet<Reduct> pendingReduct = new HashSet<Reduct>();
+ //private HashSet<Reduct> pendingReduct = new HashSet<Reduct>();
+ private LinkedList<Reduct> pendingReduct = new LinkedList<Reduct>();
/** the number of nodes in this phase */
private int numNodes = 0;
int count = 0;
Parser.Table.Reduction r = null;
for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
- //if (count==0) return; -- BEWARE! this optimization is suspected to cause really nasty heisenbugs
- if (count > 1) break;
+ //if (count==0) return; // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+ //if (count > 1) break;
//if (r.numPop == 0) break;
//r.reduce(pending, parent, null, Phase.this, null);
//return;
if (!fromEmptyReduction) n.queueReductions();
}
+
+ boolean reducing = false;
/** perform all reduction operations */
public void reduce() {
- for(Phase.Node n : hash.values()) {
- n.queueEmptyReductions();
- n.queueReductions();
- }
- while(pendingReduct.size()>0)
- pendingReduct.iterator().next().go();
+ reducing = true;
+ HashSet<Phase.Node> s = new HashSet<Phase.Node>();
+ s.addAll(hash.values());
+ //while(pendingReduct.size()>0)
+ //pendingReduct.removeFirst().go();
+ for(Phase.Node n : s) n.queueEmptyReductions();
+ for(Phase.Node n : s) n.queueReductions();
}
/** perform all shift operations, adding promoted nodes to <tt>next</tt> */
Forest res = null;
boolean ok = false;
for(Phase.Node n : hash.values()) {
+ if (n.holder==null) continue;
n.holder.resolve();
if (token == null && n.state.isAccepting()) {
ok = true;
error.append("error: unable to shift token \"" + token + "\"\n");
error.append(" before: " +pendingReductions+ "\n");
error.append(" before: " +totalReductions+ "\n");
- for(Phase.Node n : hash.values()) {
- n.queueReductions();
- n.queueEmptyReductions();
- }
+ //for(Phase.Node n : hash.values()) {
+ //n.queueReductions();
+ //n.queueEmptyReductions();
+ //}
error.append(" after: " +pendingReductions+ "\n");
error.append(" candidate states:\n");
for(Phase.Node n : hash.values()) {
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
- private HashMap<Parser.Table.Reduction,Forest> pcache = new HashMap<Parser.Table.Reduction,Forest>();
+ //private HashMap<Parser.Table.Reduction,Forest> pcache = new HashMap<Parser.Table.Reduction,Forest>();
/** a node in the GSS */
- public class Node {
+ public final class Node {
private Forest.Ref holder = null;
- private HashMap<Parser.Table.Reduction,Forest> cache = null;
- public HashMap<Parser.Table.Reduction,Forest> cache() { return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
- public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
- public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
- public FastSet<Node> parents() { return parents; }
+ private HashMap<Parser.Table.Reduction,Forest> cache = null;
- /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
- public final Phase phase = Phase.this;
+ /** the set of nodes to which there is an edge starting at this node */
+ public final FastSet<Node> parents = new FastSet<Node>(); /* ALLOC */
/** what state this node is in */
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;
- /** the set of nodes to which there is an edge starting at this node */
- public final FastSet<Node> parents = new FastSet<Node>(); /* ALLOC */
+ public HashMap<Parser.Table.Reduction,Forest> cache() {
+ return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
+ public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
+ public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
+ public FastSet<Node> parents() { return parents; }
/** FIXME */
public void queueReductions() {
queueReductions(n2);
}
+ private HashSet<Node> queued = new HashSet<Node>();
/** FIXME */
public void queueReductions(Node n2) {
- new Reduct(this, n2, null);
- for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token)) {
-
- // currently we have this weird problem where we
- // have to do an individual reduct for each child
- // when the reduction length is one (ie the
- // children wind up being children of the newly
- // created node rather than part of the popped
- // sequence
-
- if (r.numPop == 1) new Reduct(this, n2, r);
- }
+ if (queued.contains(n2)) return;
+ queued.add(n2);
+ new Reduct(this, n2, null).go();
}
/** FIXME */
public void queueEmptyReductions() {
- for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token)) {
- if (r.numPop==0)
- new Reduct(this, null, r); /* ALLOC */
- }
+ 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());
}
private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
}
}
-
// Forest / Completed Reductions //////////////////////////////////////////////////////////////////////////////
/** a pending or completed reduction */
this.n = n;
this.n2 = n2;
this.r = r;
- if (reductions.contains(this)) { done = true; return; }
+ //if (reductions.contains(this)) { done = true; return; }
reductions.add(this);
- pendingReduct.add(this);
+ pendingReduct.addFirst(this);
pendingReductions++;
+ go();
}
/** perform the reduction */
pendingReduct.remove(this);
pendingReductions--;
- // FIXME: explain this
if (r==null) {
for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
- if (r.numPop <= 1) continue;
- r.reduce(n, n2, Phase.this, null);
+
+ // UGLY HACK
+ // The problem here is that a "reduction of length 1"
+ // performed twice with different values of n2 needs
+ // to only create a *single* new result, but must add
+ // multiple parents to the node holding that result.
+ // The current reducer doesn't differentiate between
+ // the next node of an n-pop reduction and the
+ // ultimate parent of the last pop, so we need to
+ // cache instances here as a way of avoiding
+ // recreating them.
+
+ // currently we have this weird problem where we
+ // have to do an individual reduct for each child
+ // when the reduction length is one (ie the
+ // children wind up being children of the newly
+ // created node rather than part of the popped
+ // sequence
+ 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));
+ } else {
+ r.reduce(n, n2, Phase.this, null);
+ }
}
- } else if (r.numPop<=1) {
- // UGLY HACK
- // The problem here is that a "reduction of length 0/1"
- // performed twice with different values of n2 needs
- // to only create a *single* new result, but must add
- // multiple parents to the node holding that result.
- // The current reducer doesn't differentiate between
- // the next node of an n-pop reduction and the
- // ultimate parent of the last pop, so we need to
- // cache instances here as a way of avoiding
- // recreating them.
-
- Forest ret = (r.numPop==0 ? pcache : n.cache()).get(r);
- if (ret != null) r.reduce(n, n2, n.phase, ret);
- else (r.numPop==0 ? pcache : n.cache()).put(r, r.reduce(n, n2, n.phase, null));
-
- } else {
+ } else if (r.numPop != 1) {
r.reduce(n, n2, Phase.this, null);
}
}
private static long code(Parser.Table.State state, Phase start) {
return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
}
-
+ public boolean yak = false;
}
projects / sbp.git / blobdiff