X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=311fd29322d250285566a33b4579b7ac3f1319bb;hp=3c1b9da604f4a3aa3be8a607b0a6c7db463b1f75;hb=08aa6cdd07a882fdedf7a6d5c7bd0d754460965b;hpb=3885d0596c6f13f432ecd2c46f87d6477cb773b0
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 3c1b9da..311fd29 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,27 +1,10 @@
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.*;
import java.lang.reflect.*;
-//////////////////////////////////////////////////////////////////////////////
-// TODO:
-//
-// - fix public/package/private status
-//
-
-//////////////////////////////////////////////////////////////////////////////
-// Optimizations to add
-//
-// ** NOTE: not all of these are appropriate for this class -- it is
-// simply a list of optimizations not implemented. This
-// 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)
-
/** implements Tomita's Graph Structured Stack */
class GSS {
@@ -30,7 +13,7 @@ class 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;
@@ -44,7 +27,7 @@ class GSS {
public Forest.Ref finalResult = null;
/** all nodes, keyed by the value returned by code() */
- private HashMap hash = new HashMap(); /* ALLOC */
+ /*private*/ HashMap hash = new HashMap(); /* ALLOC */
/** the number of nodes in this phase */
private int numNodes = 0;
@@ -62,6 +45,8 @@ class GSS {
private String error = "generic syntax error";
public void checkFailure() throws Parser.Failed {
+ if (token==null && finalResult==null)
+ throw new Parser.Failed(error, getLocation());
if (numNodes <= 0)
throw new Parser.Failed(error, getLocation());
}
@@ -75,32 +60,32 @@ 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.addParent(parent, fromEmptyReduction);
+ //if (p.fe && p.phase() != parent.phase()) throw new Error("yep yep");
+ //if (!p.fe && p.phase() == parent.phase()) throw new Error("yep yep2");
+ 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, fromEmptyReduction); // ALLOC
n.queueEmptyReductions();
if (!fromEmptyReduction) n.queueReductions(parent);
}
@@ -126,8 +111,14 @@ class GSS {
}
}
+ public void invoke(Parser.Table.State st, Forest result, Node n) {
+ next.newNode(n, result, st, false);
+ }
+ private Phase next = null;
+
/** perform all shift operations, adding promoted nodes to next */
public void shift(Phase next, Forest result) {
+ this.next = next;
closed = true;
Forest res = null;
boolean ok = false;
@@ -141,11 +132,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) {
@@ -176,63 +170,53 @@ class GSS {
// GSS Nodes //////////////////////////////////////////////////////////////////////////////
/** 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);
- }
+ 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 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() {
+ if (!reducing) return;
if (allqueued) return;
allqueued = true;
int where = parents().size();
- for(Parser.Table.Reduction r : state.getReductions(token))
- if (r.numPop >= 1)
- r.reduce(this, null, null);
+ state.invokeReductions(token, this, this, null);
}
- /** FIXME */
public void queueReductions(Node n2) {
if (!allqueued) { queueReductions(); return; }
- for(Parser.Table.Reduction r : state.getReductions(token))
- if (r.numPop > 0)
- r.reduce(this, n2, 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, r.zero());
+ if (!reducing) return;
+ state.invokeReductions(token, this, null, null);
}
- private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
+ private boolean fe;
+ private Node(Node parent, Forest pending, Parser.Table.State state, boolean fe) {
+ this.fe = fe;
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 (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
@@ -253,6 +237,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));
}
}