public GSS(Input input, Parser parser) { this.input = input; this.parser = parser;}
public Input getInput() { return input; }
- /*
- HashSet<Reduction> finishedReductions = new HashSet<Reduction>();
- */
int numNewNodes = 0;
int numOldNodes = 0;
int viewPos = 0;
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 */
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();
for(StateNode n : hash.values()) {
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;
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, StateNode pred, State state, boolean fromEmptyReduction) {
+ 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);
- StateNode n = new StateNode(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();
}