/** implements Tomita's Graph Structured Stack */
class GSS {
+ public static int count = 0;
public GSS() { }
private Phase.Node[] reducing_list = null;
public int resets = 0;
public int waits = 0;
- HashMapBag<Integer,Sequence> inhibited = new HashMapBag<Integer,Sequence>();
- HashMapBag<Sequence,Phase.Waiting> waiting = new HashMapBag<Sequence,Phase.Waiting>();
- HashMapBag<Integer,Sequence> performed = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Sequence,Phase.Waiting> waiting = new HashMapBag<Sequence,Phase.Waiting>();
+ HashMapBag<Integer,Sequence> performed = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Integer,Sequence> lastperformed = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Integer,Sequence> expected = new HashMapBag<Integer,Sequence>();
/** FIXME */
public Forest.Ref finalResult;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
- public class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable {
+ class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable {
public void invoke(State st, Forest result, Node n) {
good |= next.newNode(n, result, st, false);
private boolean good;
private Phase next = null;
private Phase prev;
- private Token.Location location;
+ private Input.Location location;
public final Parser parser;
private Forest forest;
- public Phase(Phase prev, Parser parser, Phase previous, Tok token, Token.Location location, Forest forest) {
+ public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) throws ParseFailed {
this.prev = prev;
this.forest = forest;
this.parser = parser;
this.pos = previous==null ? 0 : previous.pos+1;
this.token = token;
this.location = location;
- inhibited.clear();
+ performed.clear();
reset();
}
- public void reset() {
+ public void reset() throws ParseFailed {
waiting.clear();
+ expected.clear();
+ lastperformed.clear();
+ lastperformed.addAll(performed);
performed.clear();
hash = new IntPairMap<Phase.Node>();
singularReductions = new IntPairMap<Forest>();
+ reset = false;
good = false;
closed = false;
reducing = false;
return true;
}
- public Token.Location getLocation() { return location; }
+ public Input.Location getLocation() { return location; }
/** add a new node (merging with existing nodes if possible)
* @param parent the parent of the new node
int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos;
Sequence owner = reduction==null ? null : reduction.owner();
if (reduction!=null) {
- if (inhibited.contains(pos, owner)) return;
+ if (owner.hates!=null) {
+ for (Sequence s : performed.getAll(pos))
+ if (owner.hates.contains(s))
+ return;
+ for (Sequence s : lastperformed.getAll(pos))
+ if (owner.hates.contains(s)) {
+ //System.out.println("now expecting ["+pos+"] => " + s);
+ expected.add(pos, s);
+ return;
+ }
+ }
if (owner.needs != null)
for(Sequence s : owner.needs)
if (!performed.contains(pos, s)) {
waiting.add(s, new Waiting(parent, pending, state, fromEmptyReduction, reduction));
return;
}
- if ((owner.needed != null && owner.needed.size()>0) ||
- (owner.hated != null && owner.hated.size()>0) ||
- (owner.hates != null && owner.hates.size()>0))
+ if (!performed.contains(pos, owner)) {
performed.add(pos, owner);
+ if (owner.hated != null)
+ for(Sequence seq : owner.hated)
+ if (performed.contains(pos, seq)) {
+ performed.remove(pos, seq);
+ reset = true;
+ }
+ }
}
if (!owner.lame)
newNode(parent, pending, state, fromEmptyReduction);
- if (reduction!=null) inhibit(reduction, parent==null?0:parent.phase().pos);
if (reduction != null) {
boolean redo = true;
while(redo) {
return true;
}
- public void uninhibit(int p, Sequence s) {
- if (s.hated!=null)
- for(Sequence s2 : s.hated)
- inhibited.remove(p, s2);
- }
-
- public void inhibit(Position r, int p) {
- if (r.owner().hated == null) return;
- // remember that dead states are still allowed to shift -- just not allowed to reduce
- boolean reset = false;
- for(Sequence seq : r.owner().hated) {
- if (performed.contains(p,seq)) {
- uninhibit(p, seq);
- //System.out.println("\nresetting due to " + r.owner() + " killing " + seq);
- //inhibited.clear();
- inhibited.add(p, seq);
- //inhibited = new HashMapBag<Integer,Sequence>();
- reset = true;
- resets++;
- throw new Reset();
- }
- inhibited.add(p, seq);
- }
- }
-
/** perform all reduction operations */
- public void reduce() {
+ public void reduce() throws ParseFailed {
try {
reducing = true;
if (reducing_list==null || reducing_list.length < hash.size())
reducing_list[i] = null;
n.performReductions();
}
+ if (reset) {
+ reset = false;
+ resets++;
+ throw new Reset();
+ }
+ for(int i : expected)
+ for(Sequence s : expected.getAll(i))
+ if (!performed.contains(i, s)) {
+ //System.out.println("resetting due to pos="+i+": " + s + " " + System.identityHashCode(s));
+ resets++;
+ throw new Reset();
+ }
} catch (Reset r) {
reset();
reduce();
}
+ count = 0;
}
+ private boolean reset = false;
class Reset extends RuntimeException { }
/** perform all shift operations, adding promoted nodes to <tt>next</tt> */
}
if (!good && token!=null)
- throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character")+" "+ANSI.purple(token)+" encountered at "+ANSI.green(getLocation())+"\n", token, hash.values()),
+ throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character ")+" \'"+
+ ANSI.purple(StringUtil.escapify(token+"", "\\\'\r\n"))+
+ "\' encountered at "+
+ ANSI.green(getLocation())+"\n", token, hash.values()),
getLocation());
if (token==null && finalResult==null)
throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
}
- public class Waiting {
+ class Waiting {
Node parent;
Forest pending;
State state;
// Node /////////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
+ final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
private Forest.Ref holder = null;
private boolean allqueued = false;
else state.invokeReductions(token, this, this, n2);
}
+ public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
public final void invoke(Position r, Node n, Node n2) {
if (n==null || n2==null || r.pos==0) {
if (r.pos==0) {
Forest[] holder = new Forest[r.pos];
if (r.pos<=0) throw new Error("called wrong form of reduce()");
int pos = r.pos-1;
- Forest old = holder[pos];
- holder[pos] = n.pending();
- if (pos==0) {
- System.arraycopy(holder, 0, r.holder, 0, holder.length);
- Forest rex = null;
- if (r.pos==1) rex = singularReductions.get(this, r);
- if (rex==null) {
- rex = r.rewrite(n.phase().getLocation());
- if (r.pos==1) singularReductions.put(this, r, rex);
- }
- n2.finish(r, rex, n.phase(), holder);
- } else {
- n2.reduce(r, pos-1, n.phase(), holder);
- }
- holder[pos] = old;
+ n.reduce(r, pos, n.phase(), holder, n2);
}
}
- public void reduce(Position r, int pos, Phase target, Forest[] holder) {
+ public void reduce(Position r, int pos, Phase target, Forest[] holder) { reduce(r, pos, target, holder, null); }
+ public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) {
Forest old = holder[pos];
holder[pos] = this.pending();
if (pos==0) {
System.arraycopy(holder, 0, r.holder, 0, holder.length);
for(int i=0; i<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
Forest rex = null;
- if (r.pos==1) rex = singularReductions.get(this, r);
+
+ // FIXME: I'm unsure about this -- basically we want to deal with the case where
+ // there are two nodes, each of whose Ref points to the same Forest instance.
+ // Some node in the next phase has both of these as parents. This might happen
+ // since the same reduction can appear in more than one state.
+ if (r.pos==1) rex = singularReductions.get(this.pending(), r);
if (rex==null) {
rex = r.rewrite(phase().getLocation());
- if (r.pos==1) singularReductions.put(this, r, rex);
+ if (r.pos==1) singularReductions.put(this.pending(), r, rex);
}
- for(Node child : this.parents()) child.finish(r, rex, target, holder);
+ if (only != null) only.finish(r, rex, target, holder);
+ else for(Node child : this.parents()) child.finish(r, rex, target, holder);
} else {
- for(Node child : this.parents()) child.reduce(r, pos-1, target, holder);
+ if (only != null) only.reduce(r, pos-1, target, holder);
+ else for(Node child : this.parents()) child.reduce(r, pos-1, target, holder);
}
holder[pos] = old;
}
target.newNode(this, result, state0, r.pos<=0, r);
}
- public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
-
private Node(Node parent, Forest pending, State state) {
this.state = state;
this.holder().merge(pending);