package edu.berkeley.sbp;
import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
import java.io.*;
import java.util.*;
private Phase.Node[] reducing_list = null;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
- public class Phase {
+ public class Phase implements Invokable<Parser.Table.State, Forest, GSS.Phase.Node> {
/** the token immediately after this phase */
public final Token token;
if (token==null) break;
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 (!state.canReduce(token)) return;
//if (count > 1) break;
//if (r.numPop == 0) break;
//r.reduce(pending, parent, null, Phase.this, null);
for(int i=0; i<num; i++) {
Node n = reducing_list[i];
reducing_list[i] = null;
- n.queueEmptyReductions();
n.queueReductions();
}
}
+ public void invoke(Parser.Table.State st, Forest result, Node n) {
+ next.newNode(n, result, st, true, this);
+ }
+ private Phase next = null;
+
/** perform all shift operations, adding promoted nodes to <tt>next</tt> */
public void shift(Phase next, Forest result) {
+ this.next = next;
closed = true;
Forest res = null;
boolean ok = false;
}
if (!n.holder.valid()) continue;
if (token == null) continue;
+ n.state.invokeShifts(token, this, result, n);
+ /*
for(Parser.Table.State st : n.state.getShifts(token)) {
if (res == null) res = result;
next.newNode(n, res, st, true, this);
ok = true;
}
+ */
}
if (!ok && token != null) {
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- public final class Node extends FastSet<Node> {
+ public final class Node extends FastSet<Node> implements Invokable<Parser.Table.Reduction, Node, Node> {
public void addParent(Node parent, boolean fromEmptyReduction) {
- parents().add(parent, true);
+ if (parents().contains(parent)) return;
+ parents().add(parent);
if (this!=parent && !fromEmptyReduction) queueReductions(parent);
}
private Forest.Ref holder = null;
private boolean allqueued = false;
- private HashMap<Parser.Table.Reduction,Forest> cache = null;
-
- /** 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 Phase phase() { return Phase.this; }
- 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 this; }
- /** FIXME */
public void queueReductions() {
if (allqueued) return;
allqueued = true;
int where = parents().size();
- 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);
+ /*
+ for(Parser.Table.Reduction r : state.getReductions(token))
+ if (r.numPop > 0)
+ r.reduce(this);
+ */
+ state.invokeReductions(token, this, this, null);
}
- /** FIXME */
- public void queueReductions(Node n2) { queueReductions(n2, true); }
- public void queueReductions(Node n2, boolean includeLongs) {
+ public void queueReductions(Node n2) {
if (!allqueued) { queueReductions(); return; }
- Node n = this;
- for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-
- // 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.
- if (r.numPop <= 0) continue;
- if (includeLongs) {
- if (r.numPop == 1) {
- Forest ret = n.cache().get(r);
- if (ret != null) r.reduce(this, n2, ret);
- else n.cache().put(r, r.reduce(this, n2, null));
- } else {
- r.reduce(this, n2, null);
- }
- }
- }
+ /*
+ for(Parser.Table.Reduction r : state.getReductions(token))
+ if (r.numPop > 0)
+ r.reduce(this, n2);
+ */
+ state.invokeReductions(token, this, this, n2);
}
-
- /** FIXME */
+ public final void invoke(Parser.Table.Reduction r, Node n, Node n2) {
+ if (n==null) {
+ if (r.numPop==0) r.reduce(this);
+ return;
+ }
+ if (r.numPop==0) return;
+ if (n2==null) {
+ r.reduce(n);
+ } else {
+ r.reduce(n, n2);
+ }
+ }
public void queueEmptyReductions() {
- if (reducing)
- for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
+ if (!reducing) return;
+ /*
+ for(Parser.Table.Reduction r : state.getReductions(token))
if (r.numPop==0)
- r.reduce(this, null, r.zero());
+ r.reduce(this);
+ */
+ state.invokeReductions(token, this, null, null);
}
private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
this.state = state;
if (pending != null) this.holder().merge(pending);
- if (parent != null) parents().add(parent, true);
+ if (parent != null) parents().add(parent);
if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
Phase.this.hash.put(code(state, start), this);
Phase.this.numNodes++;
projects / sbp.git / blobdiff