public HashSet<Element> bottom(Element e) { return acc; }
public HashSet<Element> sequence(Sequence seq) { return bottom(seq); }
public HashSet<Element> walkAtom(Atom r) {
- c.atoms.put(e, c.atoms.get(e)==null ? r.top() : c.atoms.get(e).union(r.top()));
+ c.atoms.put(e, c.atoms.get(e)==null ? r.dup() : c.atoms.get(e).union(r.dup()));
return super.walkAtom(r);
}
}
public WalkTokenSet(Topology<Tok> cs) { this.cs = cs; }
public WalkTokenSet(Topology<Tok> cs, Cache c) { super(c); this.cs = cs; }
public Topology<Tok> bottom(Element e) { return cs; }
- public Topology<Tok> walkAtom(Atom r) { cs.add(r.top()); return cs; }
+ public Topology<Tok> walkAtom(Atom r) { cs.add(r.dup()); return cs; }
}
class First<Tok extends Token> extends WalkTokenSet<Tok> {
if (e instanceof Atom) {
Topology top = c.atoms.get(pos.element());
if (top==null) continue;
- if (!(top.containsAll(((Atom)e).top()))) continue;
+ if (!(top.containsAll(((Atom)e).dup()))) continue;
} else {
if (c.ys.get(pos.element()).contains(e)) good = true;
}
if (matched) walk(a);
}
- if (e instanceof Repeat.MaximalSequence || e instanceof Repeat.Maximal)
- cs.remove(new Last<Tok>(cs.fresh(), c).walk(e));
+ if (e instanceof Sequence) {
+ Sequence s = (Sequence)e;
+ if (s.noFollow() != null) cs.remove(s.noFollow().dup());
+ }
if (c != null && e==me) {
c.follow.put(e, cs.dup());