X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=74cbb484bf568609be666fb79efc2994d345ae11;hp=45de091a13f596b55bb9cc500802deb101756bd7;hb=9ded11559a1b6f817e99355b1c9e2c88042e91d4;hpb=a0aaf681661f1e5df50324b2c6619e7ea709c00c
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 45de091..74cbb48 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,7 +1,5 @@
package edu.berkeley.sbp;
import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
import java.io.*;
import java.util.*;
@@ -27,12 +25,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 {
+ public class Phase implements Invokable {
/** 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;
@@ -71,50 +73,63 @@ class GSS {
* @param fromEmptyReduction true iff this node is being created as a result of a reduction of length zero (see GRMLR paper)
* @param start the earliest part of the input contributing to this node (used to make merging decisions)
*/
- public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
- Node p = hash.get(code(state, start));
- if (p != null) newNode2(p, parent, pending, state, fromEmptyReduction, start);
- else newNode3(parent, pending, state, fromEmptyReduction, start);
+ public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
+ Node p = hash.get(code(state, parent==null?null:parent.phase()));
+ if (p != null) newNode2(p, parent, pending, state, fromEmptyReduction);
+ else newNode3(parent, pending, state, fromEmptyReduction);
}
- private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
+ private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
p.holder.merge(pending);
- if (p.parents.contains(parent)) return;
- p.parents.add(parent, true);
+ if (p.parents().contains(parent)) return;
+ p.parents().add(parent, true);
if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
}
- private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
+ private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
do {
if (token != null && state.canShift(token)) break;
if (state.isAccepting()) break;
if (token==null) break;
- 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 (!state.canReduce(token)) return;
//if (count > 1) break;
//if (r.numPop == 0) break;
//r.reduce(pending, parent, null, Phase.this, null);
//return;
} while(false);
- Node n = new Node(parent, pending, state, start); // ALLOC
+ Node n = new Node(parent, pending, state); // ALLOC
n.queueEmptyReductions();
if (!fromEmptyReduction) n.queueReductions(parent);
}
- 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 */
public void shift(Phase next, Forest result) {
+ this.next = next;
closed = true;
Forest res = null;
boolean ok = false;
@@ -128,11 +143,14 @@ class GSS {
}
if (!n.holder.valid()) continue;
if (token == null) continue;
+ n.state.invokeShifts(token, this, result, n);
+ /*
for(Parser.Table.State st : n.state.getShifts(token)) {
if (res == null) res = result;
next.newNode(n, res, st, true, this);
ok = true;
}
+ */
}
if (!ok && token != null) {
@@ -145,13 +163,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();
}
@@ -163,84 +181,52 @@ class GSS {
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- public final class Node {
+ public final class Node extends FastSet implements Invokable {
private Forest.Ref holder = null;
private boolean allqueued = false;
- private HashMap cache = null;
-
- /** 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;
/** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
- public final Phase phase = Phase.this;
+ 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 parents; }
+ public FastSet parents() { return this; }
- /** FIXME */
public void queueReductions() {
if (allqueued) return;
allqueued = true;
- FastSet h = new FastSet();
- for(Node n : parents) h.add(n);
- for(Node n : h) queueReductions(n);
+ int where = parents().size();
+ state.invokeReductions(token, this, this, null);
}
- /** FIXME */
public void queueReductions(Node n2) {
if (!allqueued) { queueReductions(); return; }
- Node n = this;
- 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);
- }
- }
+ state.invokeReductions(token, this, this, n2);
}
-
- /** FIXME */
+ public final void invoke(Parser.Table.Reduction r, Node n, Node n2) {
+ if (n==null) {
+ if (r.numPop==0) r.reduce(this);
+ return;
+ }
+ if (r.numPop==0) return;
+ if (n2==null) r.reduce(n);
+ else r.reduce(n, n2);
+ }
public void queueEmptyReductions() {
- if (reducing)
- for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
- if (r.numPop==0)
- r.reduce(this, null, this.phase, r.zero());
+ if (!reducing) return;
+ state.invokeReductions(token, this, null, null);
}
- private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
+ private Node(Node parent, Forest pending, Parser.Table.State state) {
this.state = state;
+ Phase start = parent==null ? null : parent.phase();
if (pending != null) this.holder().merge(pending);
- if (parent != null) parents.add(parent, true);
+ if (parent != null) parents().add(parent, true);
if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
Phase.this.hash.put(code(state, start), this);
Phase.this.numNodes++;
@@ -259,7 +245,6 @@ class GSS {
/** this is something of a hack right now */
private static long code(Parser.Table.State state, Phase start) {
- return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
+ return (((long)state.idx) << 32) | (start==null ? 0 : (start.pos+1));
}
- public boolean yak = false;
}