private final Table pt;
+ private static void reachable(Element e, HashSet<Position> h) {
+ if (e instanceof Atom) return;
+ for(Sequence s : ((Union)e))
+ reachable(s.firstp(), h);
+ }
+ private static void reachable(Position p, HashSet<Position> h) {
+ if (h.contains(p)) return;
+ h.add(p);
+ if (p.element() != null) reachable(p.element(), h);
+ }
+
//public Parser( Topology top) { this(new Table( top)); }
//public Parser(String s, Topology top) { this(new Table(s, top)); }
public HashSet<Position> closure() {
HashSet<Position> hp = new HashSet<Position>();
- start0.reachable(hp);
+ reachable(start0, hp);
return hp;
}
public Position firstPosition() { return start0seq.firstp(); }
// FIXME: how does right-nullability interact with follow restrictions?
// all right-nullable rules get a reduction [Johnstone 2000]
if (p.isRightNullable(cache)) {
- Walk.Follow wf = new Walk.Follow(top.fresh(), p.owner(), all_elements, cache);
+ Walk.Follow wf = new Walk.Follow(top.empty(), p.owner(), all_elements, cache);
Reduction red = new Reduction(p);
state.reductions.put(wf.walk(p.owner()), red);
if (wf.includesEof()) state.eofReductions.add(red, true);
// if the element following this position is an atom, copy the corresponding
// set of rows out of the "master" goto table and into this state's shift table
if (p.element() != null && p.element() instanceof Atom)
- state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element()).dup()));
+ state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
}
}
if (position.isLast() || !(position.element() instanceof Atom)) continue;
Atom a = (Atom)position.element();
HashSet<Position> hp = new HashSet<Position>();
- position.next().reachable(hp);
- bag0.addAll(a.dup(), /*clo.walk()*/hp);
+ reachable(position.next(), hp);
+ bag0.addAll(a, /*clo.walk()*/hp);
}
// Step 1b: for each _minimal, contiguous_ set of characters having an identical next-position
if (ys != null) {
for(Element y : ys) {
HashSet<Position> hp = new HashSet<Position>();
- p.next().reachable(hp);
+ reachable(p.next(), hp);
move.addAll(y, hp);
}
}