int numReductions = 0;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
- class Phase<Tok> implements Invokable<State, Node, Forest>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Node> {
+ class Phase<Tok> implements Invokable<State, StateNode, Forest>, IntegerMappable, GraphViz.ToGraphViz /*, Iterable<StateNode>*/ {
// FIXME: right now, these are the performance bottleneck
private HashMapBag<Integer,Integer> performed = new HashMapBag<Integer,Integer>();
reductionQueue.add(r);
}
- public void invoke(State st, Node pred, Forest f) {
+ public void invoke(State st, StateNode pred, Forest f) {
parser.spin();
- good |= next.newNode(f, null, pred, st, false);
+ good |= next.newNode(f, null, pred, st);
}
/** the token immediately after this phase */
final Tok token;
final int pos;
- public IntPairMap<Node> hash = new IntPairMap<Node>(); /* ALLOC */
+ public IntPairMap<StateNode> hash = new IntPairMap<StateNode>(); /* ALLOC */
private boolean good = false;
private Phase next = null;
private Phase prev;
public Phase(State startState) throws ParseFailed, IOException {
this(null, null);
- newNode(null, null, null, startState, true);
+ newNode(null, null, null, startState);
}
public Phase(Phase prev, Forest forest) throws ParseFailed, IOException {
this.location = input.getLocation();
this.pos = prev==null ? 0 : prev.pos+1;
if (prev != null) prev.shift(this, forest);
numReductions = 0;
+ /*
+ finishedReductions.clear();
+ */
int minPhasePos = Integer.MAX_VALUE;
Reduction best = null;
best = r;
}
}
+ /*
+ finishedReductions.add(r);
+ */
numReductions++;
}
if (token==null) shift(null, null);
this.next = next;
// this massively improves GC performance
if (prev != null) {
- IntPairMap<Node> h = prev.hash;
+ IntPairMap<StateNode> h = prev.hash;
prev.hash = null;
prev.performed = null;
- for(Node n : h) n.check();
+ for(StateNode n : h) n.check();
}
numOldNodes = hash.size();
- for(Node n : hash.values()) {
+ for(StateNode n : hash) {
if (token == null && n.state().isAccepting()) {
if (finalResult==null) finalResult = new Forest.Many();
- for(Result r : n)
+ for(ResultNode r : n)
finalResult.merge(r.getForest());
}
if (token == null) continue;
if (token==null && finalResult==null)
ParseFailed.error("unexpected end of file", this, null,
getLocation().createRegion(getLocation()));
- for(Node n : hash) n.check();
+ for(StateNode n : hash) n.check();
}
Input.Region getRegionFromThisToNext() {
return getLocation().createRegion(getNextLocation());
}
- void newNodeFromReduction(Forest f, Pos reduction, Node pred) {
+ void newNodeFromReduction(Forest f, Pos reduction, StateNode pred) {
int pos = pred.phase().pos;
for(int s : reduction.hates())
if (performed.contains(pos, s))
performed.add(pos, reduction.provides());
Parser.Table.State state = (Parser.Table.State)pred.state().gotoSetNonTerminals.get(reduction);
if (state!=null)
- newNode(f, reduction, pred, state, reduction.numPops()<=0);
+ newNode(f, reduction, pred, state);
}
/** add a new node (merging with existing nodes if possible)
* @param parent the parent of the new node
* @param result the SPPF result corresponding to the new node
* @param state the state that the new node is in
- * @param fromEmptyReduction true iff this node is being created as a result of a reduction of length zero (see GRMLR paper)
* @param start the earliest part of the input contributing to this node (used to make merging decisions)
*/
- private boolean newNode(Forest f, Pos reduction, Node pred, State state, boolean fromEmptyReduction) {
- Node p = pred==null ? null : hash.get(state, pred.phase());
+ private boolean newNode(Forest f, Pos reduction, StateNode pred, State state) {
+ StateNode p = pred==null ? null : hash.get(state, pred.phase());
if (p != null) {
- p.addResult(f, reduction, pred);
+ p.addPred(f, reduction, pred);
return !state.doomed();
}
do {
+ // optimizations
if (token != null && state.canShift(token)) break;
if (state.isAccepting()) break;
if (token==null) break;
if (!state.canReduce(token)) return false;
} while(false);
- Node n = new Node(Phase.this, f, reduction, pred, state, fromEmptyReduction); // ALLOC
+ StateNode n = new StateNode(Phase.this, new ResultNode(f, reduction, pred), state); // ALLOC
/** FIXME: this null-result can be used to notice bogus/dead states */
for(Object s : state.conjunctStates)
- newNode(null, null, n, (State)s, fromEmptyReduction);
+ newNode(null, null, n, (State)s);
return !n.state().doomed();
}
public int size() { return hash==null ? 0 : hash.size(); }
public int pos() { return pos; }
public Tok getToken() { return token; }
- public Iterator<Node> iterator() { return hash.iterator(); }
+ //public Iterator<StateNode> iterator() { return hash.iterator(); }
public GSS getGSS() { return GSS.this; }
// GraphViz //////////////////////////////////////////////////////////////////////////////
- public GraphViz.Node toGraphViz(GraphViz gv) {
+ public GraphViz.StateNode toGraphViz(GraphViz gv) {
if (gv.hasNode(this)) return gv.createNode(this);
GraphViz.Group g = gv.createGroup(this);
g.label = "Phase " + pos;
FileOutputStream fos = new FileOutputStream(filename);
PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
GraphViz gv = new GraphViz();
+ /*
for(Object n : this)
- ((Node)n).toGraphViz(gv);
+ ((StateNode)n).toGraphViz(gv);
+ */
gv.dump(p);
p.flush();
p.close();