// class is meant to remain simple and easy to understand;
// optimizations which obscure that do not belong here (they
// should go into the compiled version instead)
-//
-// - most of our time is now spent creating and storing Reduct instances
-// - we should be able to perform Reduct's immediately after creating them...
-//
/** implements Tomita's Graph Structured Stack */
class GSS {
/** FIXME */
public Forest.Ref finalResult = null;
- /** all reductions (pending and completed) */
- private HashSet<Phase.Reduct> reductions = new HashSet<Phase.Reduct>(); /* ALLOC */
-
/** all nodes, keyed by the value returned by code() */
private HashMap<Long,Phase.Node> hash = new HashMap<Long,Phase.Node>(); /* ALLOC */
- /** the number of pending reductions */
- private int pendingReductions = 0;
- private int totalReductions = 0;
- //private HashSet<Reduct> pendingReduct = new HashSet<Reduct>();
- private LinkedList<Reduct> pendingReduct = new LinkedList<Reduct>();
-
/** the number of nodes in this phase */
private int numNodes = 0;
Node n = new Node(parent, pending, state, start); // ALLOC
n.queueEmptyReductions();
- if (!fromEmptyReduction) n.queueReductions();
+ if (!fromEmptyReduction) n.queueReductions(parent);
}
reducing = true;
HashSet<Phase.Node> s = new HashSet<Phase.Node>();
s.addAll(hash.values());
- //while(pendingReduct.size()>0)
- //pendingReduct.removeFirst().go();
for(Phase.Node n : s) n.queueEmptyReductions();
for(Phase.Node n : s) n.queueReductions();
}
if (!ok && token != null) {
StringBuffer error = new StringBuffer();
error.append("error: unable to shift token \"" + token + "\"\n");
- error.append(" before: " +pendingReductions+ "\n");
- error.append(" before: " +totalReductions+ "\n");
+ //error.append(" before: " +pendingReductions+ "\n");
+ //error.append(" before: " +totalReductions+ "\n");
//for(Phase.Node n : hash.values()) {
//n.queueReductions();
//n.queueEmptyReductions();
//}
- error.append(" after: " +pendingReductions+ "\n");
+ //error.append(" after: " +pendingReductions+ "\n");
error.append(" candidate states:\n");
for(Phase.Node n : hash.values()) {
//for(Sequence.Position p : n.state) error.append(" " + p + "\n");
}
// this massively improves GC performance
- reductions = null;
hash = null;
}
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
- //private HashMap<Parser.Table.Reduction,Forest> pcache = new HashMap<Parser.Table.Reduction,Forest>();
/** a node in the GSS */
public final class Node {
/** FIXME */
public void queueReductions() {
- for(Node n2 : parents)
- queueReductions(n2);
+ if (allqueued) return;
+ allqueued = true;
+ FastSet<Node> h = new FastSet<Node>();
+ for(Node n : parents) h.add(n);
+ for(Node n : h) queueReductions(n);
}
+ private boolean allqueued = false;
private HashSet<Node> queued = new HashSet<Node>();
/** FIXME */
public void queueReductions(Node n2) {
+ if (!allqueued) { queueReductions(); return; }
if (queued.contains(n2)) return;
queued.add(n2);
Node n = this;
}
}
- // Forest / Completed Reductions //////////////////////////////////////////////////////////////////////////////
-
- /** a pending or completed reduction */
- class Reduct {
-
- /** the node from which the reduction should begin */
- public Node n = null;
-
- /** the node on the other end of the edge to be reduced along (either: null, the second node of the reduction,
- * or the parent of the result of a length-one reduction)
- */
- public Node n2 = null;
-
- /** true iff the reduction has already been performed */
- private boolean done = false;
-
- /** the reduction to be applied */
- public Parser.Table.Reduction r;
-
- public Tree<String> result = null;
-
- public Reduct(Node n, Node n2, Parser.Table.Reduction r) {
- this.n = n;
- this.n2 = n2;
- this.r = r;
- //if (reductions.contains(this)) { done = true; return; }
- //reductions.add(this);
- //pendingReduct.addFirst(this);
- //pendingReductions++;
- go();
- }
-
- /** perform the reduction */
- public void go() {
- if (done) return;
- done = true;
- //pendingReduct.remove(this);
- //pendingReductions--;
-
- if (r==null) {
- for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-
- // UGLY HACK
- // The problem here is that a "reduction of length 1"
- // performed twice with different values of n2 needs
- // to only create a *single* new result, but must add
- // multiple parents to the node holding that result.
- // The current reducer doesn't differentiate between
- // the next node of an n-pop reduction and the
- // ultimate parent of the last pop, so we need to
- // cache instances here as a way of avoiding
- // recreating them.
-
- // currently we have this weird problem where we
- // have to do an individual reduct for each child
- // when the reduction length is one (ie the
- // children wind up being children of the newly
- // created node rather than part of the popped
- // sequence
- if (r.numPop <= 0) continue;
- if (r.numPop == 1) {
- Forest ret = n.cache().get(r);
- if (ret != null) r.reduce(n, n2, n.phase, ret);
- else n.cache().put(r, r.reduce(n, n2, n.phase, null));
- } else {
- r.reduce(n, n2, Phase.this, null);
- }
- }
- } else if (r.numPop != 1) {
- r.reduce(n, n2, Phase.this, null);
- }
- }
-
- // FIXME: this is a PITA
- public int hashCode() { return n.hashCode() ^ (r==null ? 0 : r.hashCode()) ^ (n2==null ? 0 : n2.hashCode()); }
- public boolean equals(Object o) {
- if (o==null) return false;
- if (o==this) return true;
- if (!(o instanceof Reduct)) return false;
- Reduct other = (Reduct)o;
- return equal(r, other.r) && equal(n, other.n) && equal(n2, other.n2);
- }
- }
-
}
/** helper method */
idl ::= [a-d]
}
-testcase {
-
- input "
-
-
- while x>0
- while y>0
- foo()
- bar()
-
- while x>0
- while y>0
- foo()
- bar()
-
-
-";
- output "smt:{while:{>:{{x} {0}} while:{>:{{y} {0}} sbb:{{f o o} {b a r}}}}}";
- output "smt:{while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
-
-indent !::= ww
-outdent !::= " " outdent " "
- | " " (~[]*) "\n"
-
-any !::= ~[]*
-s ::= any "\n\n" ww statement ww "\n\n" any => smt
-ww !::= sp*
-ws !::= sp**
-sp ::= " "
-
-block ::= "\n" indent blockBody
- &~ "\n" outdent ~[\ ] ~[]*
-
-blockBody ::= statement
- > statement blockBody /ws => "sbb"
-
-statement ::= call
- | ^"while" expr block /ws
-
-expr ::= ident
- | call
- | expr ^">" expr /ws
- | num
-
-call ::= expr "()" /ws
-
-num ::= [0-9]++
-
-ident ::= [a-z]++ &~ keyword
-keyword ::= "if" | "then" | "else" | "while"
-
-w ::= " " | "\n" | "\r"
-ws ::= w*
-
-
-}
+//testcase {
+//
+// input "
+//
+//
+// while x>0
+// while y>0
+// foo()
+// bar()
+//
+// while x>0
+// while y>0
+// foo()
+// bar()
+//
+//
+//";
+// output "smt:{while:{>:{{x} {0}} while:{>:{{y} {0}} sbb:{{f o o} {b a r}}}}}";
+// output "smt:{while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
+//
+//indent !::= ww
+//outdent !::= " " outdent " "
+// | " " (~[]*) "\n"
+//
+//any !::= ~[]*
+//s ::= any "\n\n" ww statement ww "\n\n" any => smt
+//ww !::= sp*
+//ws !::= sp**
+//sp ::= " "
+//
+//block ::= "\n" indent blockBody
+// &~ "\n" outdent ~[\ ] ~[]*
+//
+//blockBody ::= statement
+// > statement blockBody /ws => "sbb"
+//
+//statement ::= call
+// | ^"while" expr block /ws
+//
+//expr ::= ident
+// | call
+// | expr ^">" expr /ws
+// | num
+//
+//call ::= expr "()" /ws
+//
+//num ::= [0-9]++
+//
+//ident ::= [a-z]++ &~ keyword
+//keyword ::= "if" | "then" | "else" | "while"
+//
+//w ::= " " | "\n" | "\r"
+//ws ::= w*
+//
+//
+//}
testcase {
input "aa bb";
projects / sbp.git / commitdiff