public abstract Forest<Result> shiftToken(Tok t, Input.Location loc);
/** parse <tt>input</tt>, using the table <tt>pt</tt> to drive the parser */
- public Forest<Result> parse(Input.Stream<Tok> input) throws IOException, ParseFailed {
+ public Forest<Result> parse(Input<Tok> input) throws IOException, ParseFailed {
GSS gss = new GSS();
Input.Location loc = input.getLocation();
- GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(1, 0, 0), loc, null);
- current.newNode(null, Forest.leaf(null, null), pt.start, true);
+ GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(), loc, null);
+ current.newNode(null, Forest.leaf(null, null, null), pt.start, true);
int count = 1;
for(;;) {
loc = input.getLocation();
current.reduce();
Forest forest = current.token==null ? null : shiftToken((Tok)current.token, loc);
- GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(count, gss.resets, gss.waits), loc, forest);
+ GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(), loc, forest);
count = next.size();
if (current.isDone()) return (Forest<Result>)gss.finalResult;
current = next;
// Table //////////////////////////////////////////////////////////////////////////////
/** an SLR(1) parse table which may contain conflicts */
- public static class Table<Tok> extends Walk.Cache {
+ static class Table<Tok> extends Walk.Cache {
public final Walk.Cache cache = this;
- public void optimize(Functor<Tok,Integer> f) {
- for(State<Tok> state : all_states.values()) {
- state.oreductions = state.reductions.optimize(f);
- state.oshifts = state.shifts.optimize(f);
- }
- }
-
private void walk(Element e, HashSet<Element> hs) {
if (e==null) return;
if (hs.contains(e)) return;
public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
public Table(Union ux, Topology top) {
Union start0 = new Union("0");
- start0.add(new Sequence.Singleton(ux, null, null));
+ start0.add(new Sequence.Singleton(ux));
for(Sequence s : start0) cache.eof.put(s, true);
cache.eof.put(start0, true);
if (p.element() != null && p.element() instanceof Atom)
state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
}
+ if (top instanceof IntegerTopology)
+ for(State<Tok> state : all_states.values()) {
+ state.oreductions = state.reductions.optimize(((IntegerTopology)top).functor());
+ state.oshifts = state.shifts.optimize(((IntegerTopology)top).functor());
+ }
}
private boolean isRightNullable(Position p) {
if (p.isLast()) return true;
- if (!p.element().possiblyEpsilon(this)) return false;
+ if (!possiblyEpsilon(p.element())) return false;
return isRightNullable(p.next());
}
/** a single state in the LR table and the transitions possible from it */
- public class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
+ class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
public final int idx = master_state_idx++;
private final HashSet<Position> hs;