/** implements Tomita's Graph Structured Stack */
class GSS {
- public static int count = 0;
+ static int count = 0;
+ static int shifts = 0;
+ static int reductions = 0;
+ int resets = 0;
+ int waits = 0;
public GSS() { }
private Phase.Node[] reducing_list = null;
- public int resets = 0;
- public int waits = 0;
+ // FIXME: right now, these are the performance bottleneck
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;
+ Forest.Many finalResult;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
public Iterator<Phase.Node> iterator() { return hash.iterator(); }
public void invoke(State st, Forest result, Node n) {
+ shifts++;
good |= next.newNode(n, result, st, false);
}
}
}
}
- if (!owner.lame)
- newNode(parent, pending, state, fromEmptyReduction);
+ newNode(parent, pending, state, fromEmptyReduction);
if (reduction != null) {
boolean redo = true;
while(redo) {
boolean ok = false;
for(Phase.Node n : hash.values()) {
if (token == null && n.state.isAccepting()) {
- if (finalResult==null) finalResult = new Forest.Ref();
+ if (finalResult==null) finalResult = new Forest.Many();
for(Object f : n.results())
finalResult.merge((Forest)f);
}
/** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
public Phase phase() { return Phase.this; }
- private HashSet<Forest.Ref> resultMap = new HashSet<Forest.Ref>();
- public Iterable<Forest.Ref> results() { return resultMap; }
+ private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
+ public Iterable<Forest.Many> results() { return resultMap; }
public FastSet<Node> parents() { return set; }
public boolean merge(Node parent, Forest result) {
- for(Forest.Ref f : results()) {
+ // FIXME: inefficient!
+ for(Forest.Many f : results()) {
if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
f.merge(result);
return true;
}
}
- Forest.Ref f = new Forest.Ref();
+ Forest.Many f = new Forest.Many();
f.parents.add(parent);
f.merge(result);
resultMap.add(f);
public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
public final void invoke(Position r, Node n, Node n2) {
+ reductions++;
if (n==null || n2==null || r.pos==0) {
if (r.pos==0) {
if (n==null) n = this;
}
if (n==null) return;
Forest[] holder = new Forest[r.pos];
- if (r.pos==0) n.finish(r, r.zero(), n.phase(), holder);
- else n.reduce(r, r.pos-1, n.phase(), holder, null);
+ if (r.pos==0) n.finish(r, r.zero(), n.phase());
+ else n.reduce(r, r.pos-1, n.phase(), null);
} else {
- Forest[] holder = new Forest[r.pos];
if (r.pos<=0) throw new Error("called wrong form of reduce()");
int pos = r.pos-1;
- n.reduce(r, pos, n.phase(), holder, n2);
+ n.reduce(r, pos, n.phase(), n2);
}
}
- public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) {
- holder = r.holder;
+ public void reduce(Position r, int pos, Phase target, Node only) {
+ Forest[] holder = r.holder;
Forest old = holder[pos];
- for(Forest result : results())
- for(Node child : ((Forest.Ref<?>)result).parents) {
+ HashSet<Forest> rr = new HashSet<Forest>();
+ for(Forest result : results()) rr.add(result);
+ for(Forest result : rr)
+ for(Node child : ((Forest.Many<?>)result).parents) {
if (only != null && child!=only) continue;
holder[pos] = result;
- 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");
- child.finish(r, r.rewrite(phase().getLocation()), target, holder);
- } else {
- child.reduce(r, pos-1, target, holder, null);
- }
+ if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(phase().getLocation())), target);
+ else child.reduce(r, pos-1, target, null);
}
holder[pos] = old;
}
- public void finish(Position r, Forest result, Phase<Tok> target, Forest[] holder) {
+ public void finish(Position r, Forest result, Phase<Tok> target) {
Parser.Table<Tok>.State<Tok> state0 = state.gotoSetNonTerminals.get(r.owner());
if (result==null) throw new Error();
if (state0!=null)