X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=80fbd5c4655f28e7e0e2aad060b02975fe09ddca;hb=e5cfb136bf7fd1352eff1bd87a458aa4ff748537;hp=743cfd381622afc430958b743fe5ac622ccb203a;hpb=6ae224025882c9929e2e4e9e8461decbf3b9cae4;p=sbp.git
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 743cfd3..80fbd5c 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -11,6 +11,7 @@ import java.lang.reflect.*;
class GSS {
public static int count = 0;
+
public GSS() { }
private Phase.Node[] reducing_list = null;
@@ -26,8 +27,9 @@ class GSS {
public Forest.Ref finalResult;
/** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */
- class Phase implements Invokable.Node>, IntegerMappable {
+ class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable {
+ public Iterator iterator() { return hash.iterator(); }
public void invoke(State st, Forest result, Node n) {
good |= next.newNode(n, result, st, false);
}
@@ -147,8 +149,8 @@ class GSS {
}
}
private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) {
- p.holder.merge(pending);
- if (p.parents().contains(parent)) return true;
+ //if (p.parents().contains(parent)) return true;
+ p.merge(parent, pending);
p.parents().add(parent, true);
if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent);
return true;
@@ -216,7 +218,7 @@ class GSS {
/** perform all shift operations, adding promoted nodes to next */
public void shift(Phase next, Forest result) throws ParseFailed {
// this massively improves GC performance
- if (prev!=null) {
+ if (prev!=null && parser.helpgc) {
prev.hash = null;
prev.singularReductions = null;
}
@@ -227,7 +229,8 @@ class GSS {
for(Phase.Node n : hash.values()) {
if (token == null && n.state.isAccepting()) {
if (finalResult==null) finalResult = new Forest.Ref();
- finalResult.merge(n.holder);
+ for(Object f : n.results())
+ finalResult.merge((Forest)f);
}
if (token == null) continue;
n.state.invokeShifts(token, this, result, n);
@@ -268,9 +271,27 @@ class GSS {
// Node /////////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- final class Node extends FastSet implements Invokable, IntegerMappable {
+ final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz {
+ public FastSet set = new FastSet();
+
+ public GraphViz.Node toGraphViz(GraphViz gv) {
+ if (gv.hasNode(this)) return gv.createNode(this);
+ GraphViz.Node n = gv.createNode(this);
+ n.label = ""+state.toStringx();
+ n.shape = "rectangle";
+ n.fill = "green";
+ //GraphViz.Node f = pending().toGraphViz(gv);
+ //n.add(f);
+ for(Forest result : results()) n.edge(result, "");
+ for(Node parent : parents()) n.edge(parent, "");
+ ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
+ return n;
+ }
+ public boolean isTransparent() { return false; }
+ public boolean isHidden() { return false; }
+
- private Forest.Ref holder = null;
+ //private Forest.Ref holder = new Forest.Ref();
private boolean allqueued = false;
/** what state this node is in */
@@ -278,9 +299,28 @@ class GSS {
/** 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 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; }
+ //private Forest pending() { return !Phase.this.closed ? holder : holder.resolve(); }
+ private HashMap resultMap = new HashMap();
+ public void merge(Node parent, Forest result) {
+ //holder.merge(result);
+ Forest.Ref f = (Forest.Ref)resultMap.get(parent);
+ if (f==null) { f = new Forest.Ref(); resultMap.put(parent, f); }
+ f.merge(result);
+ set.add(parent, true);
+ }
+ //public Iterable childrenFor(Forest result) { return resultMap.getAll(result); }
+ public Iterable results() { return resultMap.values(); }
+ private Forest pending(Node n) {
+ //return !Phase.this.closed ? holder : holder.resolve();
+ /*
+ for(Forest f : resultMap)
+ if (resultMap.contains(f, n))
+ return f;
+ return null;
+ */
+ return resultMap.get(n);
+ }
+ public FastSet parents() { return set; }
public void performReductions() {
if (allqueued) return;
@@ -295,6 +335,7 @@ class GSS {
public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
public final void invoke(Position r, Node n, Node n2) {
+ //if (r.owner().lame) return;
if (n==null || n2==null || r.pos==0) {
if (r.pos==0) {
if (n==null) n = this;
@@ -303,38 +344,70 @@ class GSS {
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);
+ else n.reduce(r, r.pos-1, n.phase(), holder, null, n.pending(n));
} 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(), holder, n2, n.pending(n));
}
}
- 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) {
+ reduce(r, pos, target, holder, null); }
public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) {
+ reduce(r, pos, target, holder, only, this.pending());
+ }
+ */
+ public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) {
Forest old = holder[pos];
- holder[pos] = this.pending();
+ holder[pos] = pending;
if (pos==0) {
- System.arraycopy(holder, 0, r.holder, 0, holder.length);
- for(int i=0; i