X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=0b6064d633bc02db04426ba46d91379838df8ed4;hp=abe4aa390cbe37d0e84167e227ccccf786187e6f;hb=72cc02d0f08922a98b9f2139e814b6c33b275a43;hpb=f9536341fe8a0fc979f307d9ad5a189c96ec5850;ds=sidebyside
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index abe4aa3..0b6064d 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -27,12 +27,16 @@ 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;
@@ -79,8 +83,7 @@ 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);
+ p.addParent(parent, fromEmptyReduction);
}
private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
do {
@@ -103,14 +106,20 @@ class GSS {
}
- boolean reducing = false;
/** perform all reduction operations */
public void reduce() {
reducing = true;
- HashSet s = new HashSet();
- s.addAll(hash.values());
- for(Phase.Node n : s) n.queueEmptyReductions();
- for(Phase.Node n : s) n.queueReductions();
+ 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; inext */
@@ -145,13 +154,13 @@ class GSS {
//n.queueEmptyReductions();
//}
//error.append(" after: " +pendingReductions+ "\n");
- error.append(" candidate states:\n");
- for(Phase.Node n : hash.values()) {
+ //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();
}
@@ -165,6 +174,11 @@ class GSS {
/** a node in the GSS */
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 boolean allqueued = false;
@@ -180,7 +194,8 @@ class GSS {
public final Phase phase = Phase.this;
public HashMap cache() {
- return cache==null ? (cache = new 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; }
@@ -209,13 +224,6 @@ class GSS {
// 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);
@@ -260,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);
}
- public boolean yak = false;
}