X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=5bfbd52ee7cb31e17ae17e32b19f8e474fbfaaeb;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;hp=6316aad99a8e3bca851ce5f52bdc4fb8ea00fb27;hpb=6c04c94d0eff9dc0fd1a0c2c36c8adc18f17d191;p=sbp.git
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 6316aad..5bfbd52 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,9 +1,8 @@
package edu.berkeley.sbp;
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
+import edu.berkeley.sbp.Parser.Table.*;
import edu.berkeley.sbp.Sequence.Position;
-import edu.berkeley.sbp.Parser.Table.State;
-import edu.berkeley.sbp.Parser.Table.Reduction;
import java.io.*;
import java.util.*;
import java.lang.reflect.*;
@@ -25,10 +24,14 @@ class GSS {
public Forest.Ref finalResult;
/** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */
- public class Phase implements Invokable, IntegerMappable {
+ public class Phase implements Invokable.Node>, IntegerMappable {
+
+ public void invoke(State st, Forest result, Node n) {
+ good |= next.newNode(n, result, st, false);
+ }
/** the token immediately after this phase */
- final Token token;
+ final Tok token;
private final int pos;
@@ -43,7 +46,7 @@ class GSS {
private Forest forest;
- public Phase(Phase prev, Parser parser, Phase previous, Token token, Token.Location location, Forest forest) {
+ public Phase(Phase prev, Parser parser, Phase previous, Tok token, Token.Location location, Forest forest) {
this.prev = prev;
this.forest = forest;
this.parser = parser;
@@ -87,9 +90,9 @@ class GSS {
if (p != null) return newNode2(p, parent, pending, state, fromEmptyReduction);
else return newNode3(parent, pending, state, fromEmptyReduction);
}
- public void newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+ public void newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos;
- Sequence owner = reduction==null ? null : reduction.position.owner();
+ Sequence owner = reduction==null ? null : reduction.owner();
if (reduction!=null) {
if (inhibited.contains(pos, owner)) return;
if (owner.needs != null)
@@ -154,14 +157,14 @@ class GSS {
inhibited.remove(p, s2);
}
- public void inhibit(Reduction r, int p) {
- if (r.position.owner().hated == null) return;
+ public void inhibit(Position r, int p) {
+ if (r.owner().hated == null) return;
// remember that dead states are still allowed to shift -- just not allowed to reduce
boolean reset = false;
- for(Sequence seq : r.position.owner().hated) {
+ for(Sequence seq : r.owner().hated) {
if (performed.contains(p,seq)) {
uninhibit(p, seq);
- //System.out.println("\nresetting due to " + r.position.owner() + " killing " + seq);
+ //System.out.println("\nresetting due to " + r.owner() + " killing " + seq);
//inhibited.clear();
inhibited.add(p, seq);
//inhibited = new HashMapBag();
@@ -199,10 +202,6 @@ class GSS {
class Reset extends RuntimeException { }
- public void invoke(State st, Forest result, Node n) {
- good |= next.newNode(n, result, st, false);
- }
-
/** perform all shift operations, adding promoted nodes to next */
public void shift(Phase next, Forest result) throws ParseFailed {
// this massively improves GC performance
@@ -234,8 +233,8 @@ class GSS {
Forest pending;
State state;
boolean fromEmptyReduction;
- Reduction reduction;
- public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+ Position reduction;
+ public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
waits++;
this.parent = parent;
this.pending = pending;
@@ -252,13 +251,13 @@ class GSS {
// Node /////////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- public final class Node extends FastSet implements Invokable {
+ public final class Node extends FastSet implements Invokable {
private Forest.Ref holder = null;
private boolean allqueued = false;
/** what state this node is in */
- public final State state;
+ 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; }
@@ -277,20 +276,54 @@ class GSS {
else state.invokeReductions(token, this, this, n2);
}
- public final void invoke(Reduction r, Node n, Node n2) {
- if (n==null || n2==null || r.position.pos==0) {
- if (r.position.pos==0) {
+ public final void invoke(Position r, Node n, Node n2) {
+ if (n==null || n2==null || r.pos==0) {
+ if (r.pos==0) {
if (n==null) n = this;
else return;
}
if (n==null) return;
- Forest[] holder = new Forest[r.position.pos];
- if (r.position.pos==0) r.finish(n, r.zero(), n.phase(), holder);
- else r.reduce(n, r.position.pos-1, n.phase(), holder);
+ 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 {
- r.reduce(n, n2);
+ Forest[] holder = new Forest[r.pos];
+ if (r.pos<=0) throw new Error("called wrong form of reduce()");
+ int pos = r.pos-1;
+ Forest old = holder[pos];
+ holder[pos] = n.pending();
+ if (pos==0) {
+ System.arraycopy(holder, 0, r.holder, 0, holder.length);
+ Forest rex = r.rewrite(n.phase().getLocation());
+ n2.finish(r, rex, n.phase(), holder);
+ } else {
+ n2.reduce(r, pos-1, n.phase(), holder);
+ }
+ holder[pos] = old;
+ }
+ }
+
+ public void reduce(Position r, int pos, Phase target, Forest[] holder) {
+ Forest old = holder[pos];
+ holder[pos] = this.pending();
+ if (pos==0) {
+ System.arraycopy(holder, 0, r.holder, 0, holder.length);
+ for(int i=0; i target, Forest[] holder) {
+ Parser.Table.State state0 = state.gotoSetNonTerminals.get(r.owner());
+ if (result==null) throw new Error();
+ if (state0!=null)
+ target.newNode(this, result, state0, r.pos<=0, r);
}
+
public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
private Node(Node parent, Forest pending, State state) {