X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=7bba6a67240a6ef59a5bbadde7022639160f5699;hp=d8c0fd45430a2f3cc1f020408a9a25e8ff665212;hb=f71911854d01647a743d52bfccff8d78a4497550;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4;ds=sidebyside
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index d8c0fd4..7bba6a6 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -21,47 +21,41 @@ import java.lang.reflect.*;
// 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 {
public GSS() { }
+ private Phase.Node[] reducing_list = null;
+
/** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */
public class Phase {
/** the token immediately after this phase */
public final Token token;
+ boolean reducing = false;
+
/** currently this is necessary only for the code() hack -- it doesn't actually correspond to the input */
private final int pos;
/** FIXME */
public Forest.Ref finalResult = null;
- /** all reductions (pending and completed) */
- private HashSet reductions = new HashSet(); /* ALLOC */
-
/** all nodes, keyed by the value returned by code() */
private HashMap hash = new HashMap(); /* ALLOC */
- /** the number of pending reductions */
- private int pendingReductions = 0;
- private int totalReductions = 0;
- private HashSet pendingReduct = new HashSet();
-
/** the number of nodes in this phase */
private int numNodes = 0;
boolean closed = false;
- public Phase(Phase previous, Token token) {
+ private Token.Location location;
+ public Phase(Phase previous, Token token, Token.Location location) {
this.pos = previous==null ? 0 : previous.pos+1;
this.token = token;
+ this.location = location;
}
public boolean isDone() { return token == null; }
@@ -72,7 +66,7 @@ class GSS {
throw new Parser.Failed(error, getLocation());
}
- public Token.Location getLocation() { return token==null ? null : token.getLocation(); }
+ public Token.Location getLocation() { return location; }
/** add a new node (merging with existing nodes if possible)
* @param parent the parent of the new node
@@ -88,9 +82,8 @@ class GSS {
}
private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
p.holder.merge(pending);
- if (p.parents.contains(parent)) return;
- p.parents.add(parent, true);
- if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
+ if (p.parents().contains(parent)) return;
+ p.addParent(parent, fromEmptyReduction);
}
private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
do {
@@ -100,8 +93,8 @@ class GSS {
int count = 0;
Parser.Table.Reduction r = null;
for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
- //if (count==0) return; -- BEWARE! this optimization is suspected to cause really nasty heisenbugs
- if (count > 1) break;
+ if (count==0) return; // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+ //if (count > 1) break;
//if (r.numPop == 0) break;
//r.reduce(pending, parent, null, Phase.this, null);
//return;
@@ -109,25 +102,33 @@ class GSS {
Node n = new Node(parent, pending, state, start); // ALLOC
n.queueEmptyReductions();
- if (!fromEmptyReduction) n.queueReductions();
+ if (!fromEmptyReduction) n.queueReductions(parent);
}
+
/** perform all reduction operations */
public void reduce() {
- for(Phase.Node n : hash.values()) {
+ reducing = true;
+ if (reducing_list==null || reducing_list.length < hash.size())
+ reducing_list = new Phase.Node[hash.size() * 4];
+ Collection hv = hash.values();
+ hv.toArray(reducing_list);
+ int num = hv.size();
+ for(int i=0; i0)
- pendingReduct.iterator().next().go();
}
/** perform all shift operations, adding promoted nodes to next */
- public void shift(Phase next) {
+ public void shift(Phase next, Forest result) {
closed = true;
Forest res = null;
boolean ok = false;
for(Phase.Node n : hash.values()) {
+ if (n.holder==null) continue;
n.holder.resolve();
if (token == null && n.state.isAccepting()) {
ok = true;
@@ -137,7 +138,7 @@ class GSS {
if (!n.holder.valid()) continue;
if (token == null) continue;
for(Parser.Table.State st : n.state.getShifts(token)) {
- if (res == null) res = Forest.create(token.getLocation(), token.result(), null, null, false, false);
+ if (res == null) res = result;
next.newNode(n, res, st, true, this);
ok = true;
}
@@ -146,87 +147,107 @@ class GSS {
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");
- for(Phase.Node n : hash.values()) {
- n.queueReductions();
- n.queueEmptyReductions();
- }
- error.append(" after: " +pendingReductions+ "\n");
- error.append(" candidate states:\n");
- for(Phase.Node n : hash.values()) {
+ //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(" candidate states:\n");
+ //for(Phase.Node n : hash.values()) {
//for(Sequence.Position p : n.state) error.append(" " + p + "\n");
//error.append(" --\n");
- for(Parser.Table.Reduction r : n.state.getReductions(token)) error.append(" " + r + "\n");
+ //for(Parser.Table.Reduction r : n.state.getReductions(token)) error.append(" " + r + "\n");
//error.append(" ==\n");
- }
+ //}
next.error = error.toString();
}
// this massively improves GC performance
- reductions = null;
hash = null;
}
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
- private HashMap pcache = new HashMap();
/** a node in the GSS */
- public class Node {
+ public final class Node extends FastSet {
+
+ public void addParent(Node parent, boolean fromEmptyReduction) {
+ parents().add(parent, true);
+ if (this!=parent && !fromEmptyReduction) queueReductions(parent);
+ }
private Forest.Ref holder = null;
- private HashMap cache = null;
+ private boolean allqueued = false;
- public HashMap cache() { return cache==null ? (cache = new HashMap()) : cache; }
- public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
- public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
- public FastSet parents() { return parents; }
+ private HashMap cache = null;
- /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
- public final Phase phase = Phase.this;
+ /** the set of nodes to which there is an edge starting at this node */
+ //public final FastSet parents = new FastSet(); /* ALLOC */
/** what state this node is in */
public final Parser.Table.State state;
- /** the set of nodes to which there is an edge starting at this node */
- public final FastSet parents = new FastSet(); /* ALLOC */
+ /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
+ public Phase phase() { return Phase.this; }
+
+ public HashMap cache() {
+ return cache==null ? (cache = new HashMap()) : cache;
+ }
+ public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
+ public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
+ public FastSet parents() { return this; }
/** FIXME */
public void queueReductions() {
- for(Node n2 : parents)
- queueReductions(n2);
+ if (allqueued) return;
+ allqueued = true;
+ int where = parents().size();
+ for(int i=0; i 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.add(this);
- pendingReductions++;
- }
-
- /** perform the reduction */
- public void go() {
- if (done) return;
- done = true;
- pendingReduct.remove(this);
- pendingReductions--;
-
- // FIXME: explain this
- if (r==null) {
- for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
- if (r.numPop <= 1) continue;
- r.reduce(n, n2, Phase.this, null);
- }
- } else if (r.numPop<=1) {
- // UGLY HACK
- // The problem here is that a "reduction of length 0/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.
-
- Forest ret = (r.numPop==0 ? pcache : n.cache()).get(r);
- if (ret != null) r.reduce(n, n2, n.phase, ret);
- else (r.numPop==0 ? pcache : n.cache()).put(r, r.reduce(n, n2, n.phase, null));
-
- } else {
- 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 */
@@ -324,5 +268,4 @@ class GSS {
private static long code(Parser.Table.State state, Phase start) {
return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
}
-
}