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.*;
public int resets = 0;
public int waits = 0;
- HashMapBag<Integer,Sequence> inhibited = new HashMapBag<Integer,Sequence>();
- HashMapBag<Sequence,Phase.Waiting> waiting = new HashMapBag<Sequence,Phase.Waiting>();
- HashMapBag<Integer,Sequence> performed = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Integer,Sequence> inhibited = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Integer,Sequence> expectedInhibit = new HashMapBag<Integer,Sequence>();
+ HashMapBag<Sequence,Phase.Waiting> waiting = new HashMapBag<Sequence,Phase.Waiting>();
+ HashMapBag<Integer,Sequence> performed = new HashMapBag<Integer,Sequence>();
/** FIXME */
public Forest.Ref finalResult;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
- public class Phase implements Invokable<State, Forest, GSS.Phase.Node>, IntegerMappable {
+ public class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.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;
boolean reducing;
private IntPairMap<Phase.Node> hash; /* ALLOC */
+ private IntPairMap<Forest> singularReductions; /* ALLOC */
private boolean closed;
private boolean good;
private Phase next = null;
private Phase prev;
- private Token.Location location;
+ private Input.Location location;
public final Parser parser;
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, Input.Location location, Forest forest) {
this.prev = prev;
this.forest = forest;
this.parser = parser;
waiting.clear();
performed.clear();
hash = new IntPairMap<Phase.Node>();
+ singularReductions = new IntPairMap<Forest>();
+ expectedInhibit.clear();
+ expectedInhibit.addAll(inhibited);
good = false;
closed = false;
reducing = false;
return true;
}
- public Token.Location getLocation() { return location; }
+ public Input.Location getLocation() { return location; }
/** add a new node (merging with existing nodes if possible)
* @param parent the parent of the new node
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)
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<Integer,Sequence>();
throw new Reset();
}
inhibited.add(p, seq);
+ expectedInhibit.remove(p, seq);
}
}
reducing_list[i] = null;
n.performReductions();
}
+ if (expectedInhibit.size() > 0) {
+ inhibited.removeAll(expectedInhibit);
+ System.out.println("\n!!!!\n");
+ throw new Reset();
+ }
} catch (Reset r) {
reset();
reduce();
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 <tt>next</tt> */
public void shift(Phase next, Forest result) throws ParseFailed {
// this massively improves GC performance
- if (prev!=null) prev.hash = null;
+ if (prev!=null) {
+ prev.hash = null;
+ prev.singularReductions = null;
+ }
this.next = next;
closed = true;
Forest res = null;
}
if (!good && token!=null)
- throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character")+" "+ANSI.purple(token)+" encountered at "+ANSI.green(getLocation())+"\n", token, hash.values()),
+ throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character ")+" \'"+
+ ANSI.purple(StringUtil.escapify(token+"", "\\\'\r\n"))+
+ "\' encountered at "+
+ ANSI.green(getLocation())+"\n", token, hash.values()),
getLocation());
if (token==null && finalResult==null)
throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
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;
// Node /////////////////////////////////////////////////////////////////////////////////
/** a node in the GSS */
- public final class Node extends FastSet<Node> implements Invokable<Reduction, Node, Node> {
+ public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
private Forest.Ref holder = null;
private boolean allqueued = false;
/** what state this node is in */
- public final State state;
+ public final Parser.Table<Tok>.State<Tok> 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; }
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 void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
+ 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 {
- Forest[] holder = new Forest[r.position.pos];
- if (r.position.pos<=0) throw new Error("called wrong form of reduce()");
- int pos = r.position.pos-1;
+ 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.position.holder, 0, holder.length);
- Forest rex = r.position.rewrite(n.phase().getLocation());
- r.finish(n2, rex, n.phase(), holder);
+ System.arraycopy(holder, 0, r.holder, 0, holder.length);
+ Forest rex = null;
+ if (r.pos==1) rex = singularReductions.get(this, r);
+ if (rex==null) {
+ rex = r.rewrite(n.phase().getLocation());
+ if (r.pos==1) singularReductions.put(this, r, rex);
+ }
+ n2.finish(r, rex, n.phase(), holder);
} else {
- r.reduce(n2, pos-1, n.phase(), holder);
+ n2.reduce(r, pos-1, n.phase(), holder);
}
holder[pos] = old;
}
}
- public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
+
+ 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<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
+ Forest rex = null;
+ if (r.pos==1) rex = singularReductions.get(this, r);
+ if (rex==null) {
+ rex = r.rewrite(phase().getLocation());
+ if (r.pos==1) singularReductions.put(this, r, rex);
+ }
+ for(Node child : this.parents()) child.finish(r, rex, target, holder);
+ } else {
+ for(Node child : this.parents()) child.reduce(r, pos-1, target, holder);
+ }
+ holder[pos] = old;
+ }
+
+ public void finish(Position r, Forest result, Phase<Tok> target, Forest[] holder) {
+ Parser.Table<Tok>.State<Tok> state0 = state.gotoSetNonTerminals.get(r.owner());
+ if (result==null) throw new Error();
+ if (state0!=null)
+ target.newNode(this, result, state0, r.pos<=0, r);
+ }
private Node(Node parent, Forest pending, State state) {
this.state = state;
if (Phase.this.hash.get(state, start) != null) throw new Error("severe problem!");
Phase.this.hash.put(state, start, this);
}
+ public int toInt() { return idx; }
+ private final int idx = node_idx++;
}
+ private int node_idx = 0;
public int toInt() { return pos+1; }
public int size() { return hash==null ? 0 : hash.size(); }
projects / sbp.git / blobdiff