X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=81e4909300a2beaadcf0ffe27624cb17a480040c;hb=f05128e0aee9894a93455dd425ed6104a90a3999;hp=5255a21a65da9649d02dc0af5c5b998d82b49a66;hpb=62be1c1ae2ac13086b508e34eeffdb7e536d5b61;p=sbp.git
diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 5255a21..81e4909 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,10 +1,11 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
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.Sequence.Pos;
+import edu.berkeley.sbp.Sequence.Pos;
import java.io.*;
import java.util.*;
import java.lang.reflect.*;
@@ -12,414 +13,208 @@ import java.lang.reflect.*;
/** implements Tomita's Graph Structured Stack */
class GSS {
- static int count = 0;
- static int shifts = 0;
- static int reductions = 0;
- int resets = 0;
- int waits = 0;
-
Input input;
+ private Parser parser;
+ public GSS(Input input, Parser parser) { this.input = input; this.parser = parser;}
+ public Input getInput() { return input; }
- public GSS(Input input) { this.input = input; }
+ int numNewNodes = 0;
+ int numOldNodes = 0;
+ int viewPos = 0;
+ int numReductions = 0;
- private Phase.Node[] reducing_list = null;
+ /** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */
+ class Phase implements Invokable, IntegerMappable, GraphViz.ToGraphViz /*, Iterable*/ {
- // FIXME: right now, these are the performance bottleneck
- HashMapBag waiting = new HashMapBag();
- HashMapBag performed = new HashMapBag();
- HashMapBag lastperformed = new HashMapBag();
- HashMapBag expected = new HashMapBag();
-
- /** FIXME */
- Forest.Many finalResult;
+ // FIXME: right now, these are the performance bottleneck
+ private HashMapBag performed = new HashMapBag();
- /** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */
- class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable {
+ public Forest.Many finalResult;
+ private PriorityQueue reductionQueue = new PriorityQueue();
+
+ Parser parser() { return parser; }
+ public void addReduction(Reduction r) {
+ //System.out.println("+ " + r);
+ parser.spin();
+ reductionQueue.add(r);
+ }
- public Iterator iterator() { return hash.iterator(); }
- public void invoke(State st, Forest result, Node n) {
- shifts++;
- good |= next.newNode(n, result, st, false);
+ public void invoke(State st, StateNode pred, Forest f) {
+ parser.spin();
+ good |= next.newNode(f, null, pred, st);
}
/** the token immediately after this phase */
final Tok token;
-
- private final int pos;
-
- boolean reducing;
- private IntPairMap hash; /* ALLOC */
- private boolean closed;
- private boolean good;
+ final int pos;
+ public IntPairMap hash = new IntPairMap(); /* ALLOC */
+ private boolean good = false;
private Phase next = null;
private Phase prev;
private Input.Location location;
private Input.Location nextLocation;
- private Input.Location prevLocation;
- public final Parser parser;
-
private Forest forest;
- public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location,
- Input.Location nextLocation, Forest forest) throws ParseFailed {
- this.prevLocation = prev==null ? location : prev.getLocation();
+ public Phase(State startState) throws ParseFailed, IOException {
+ this(null, null);
+ newNode(null, null, null, startState);
+ }
+ public Phase(Phase prev, Forest forest) throws ParseFailed, IOException {
+ this.location = input.getLocation();
+ this.token = (Tok)input.next();
+ this.nextLocation = input.getLocation();
this.prev = prev;
this.forest = forest;
- this.parser = parser;
- this.pos = previous==null ? 0 : previous.pos+1;
- this.token = token;
- this.location = location;
- this.nextLocation = nextLocation;
- performed.clear();
- reset();
- }
-
- public void reset() throws ParseFailed {
- waiting.clear();
- expected.clear();
- lastperformed.clear();
- lastperformed.addAll(performed);
- performed.clear();
- hash = new IntPairMap();
- reset = false;
- good = false;
- closed = false;
- reducing = false;
- finalResult = null;
+ this.pos = prev==null ? 0 : prev.pos+1;
if (prev != null) prev.shift(this, forest);
+ numReductions = 0;
+ /*
+ finishedReductions.clear();
+ */
+
+ int minPhasePos = Integer.MAX_VALUE;
+ Reduction best = null;
+ //System.out.println("==============================================================================");
+ while(!reductionQueue.isEmpty()) {
+ Reduction r = reductionQueue.poll();
+ //System.out.println("- " + r);
+ if (r.predPhase() != null)
+ if (r.predPhase().pos > minPhasePos)
+ throw new Error();
+ r.perform();
+ if (r.predPhase() != null) {
+ if (r.predPhase().pos < minPhasePos) {
+ minPhasePos = r.predPhase().pos;
+ best = r;
+ } else if (r.predPhase().pos == minPhasePos) {
+ /*
+ if (best != null && Parser.mastercache.comparePositions(r.reduction(), best.reduction()) < 0)
+ throw new Error("\n"+r+"\n"+best+"\n"+
+ Parser.mastercache.comparePositions(r.reduction(), best.reduction())+"\n"+r.compareTo(best)+
+ "\n"+(r.reduction().ord-best.reduction().ord));
+ */
+ best = r;
+ }
+ }
+ /*
+ finishedReductions.add(r);
+ */
+ numReductions++;
+ }
+ if (token==null) shift(null, null);
}
-
public boolean isDone() throws ParseFailed {
if (token != null) return false;
if (token==null && finalResult==null)
- ParseFailed.error("unexpected end of file",
- getLocation(),
- token,
- hash.values(),
- getLocation().createRegion(getLocation()),
- input,
- GSS.this);
+ ParseFailed.error("unexpected end of file", this, null,
+ getLocation().createRegion(getLocation()));
return true;
}
- public Input.Location getPrevLocation() { return prevLocation; }
public Input.Location getLocation() { return location; }
- public Input.Region getRegion() { return getPrevLocation().createRegion(getLocation()); }
public Input.Location getNextLocation() { return nextLocation; }
-
- /** add a new node (merging with existing nodes if possible)
- * @param parent the parent of the new node
- * @param result the SPPF result corresponding to the new node
- * @param state the state that the new node is in
- * @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 boolean newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction) {
- Node p = hash.get(state, parent==null?null:parent.phase());
- 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, Position reduction) {
- int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos;
- Sequence owner = reduction==null ? null : reduction.owner();
- if (reduction!=null) {
- if (owner.hates!=null) {
- for (Sequence s : performed.getAll(pos))
- if (owner.hates.contains(s))
- return;
- for (Sequence s : lastperformed.getAll(pos))
- if (owner.hates.contains(s)) {
- //System.out.println("now expecting ["+pos+"] => " + s);
- expected.add(pos, s);
- return;
- }
- }
- if (owner.needs != null)
- for(Sequence s : owner.needs)
- if (!performed.contains(pos, s)) {
- waiting.add(s, new Waiting(parent, pending, state, fromEmptyReduction, reduction));
- return;
- }
- if (!performed.contains(pos, owner)) {
- performed.add(pos, owner);
- if (owner.hated != null)
- for(Sequence seq : owner.hated)
- if (performed.contains(pos, seq)) {
- performed.remove(pos, seq);
- reset = true;
- }
- }
- }
- newNode(parent, pending, state, fromEmptyReduction);
- if (reduction != null) {
- boolean redo = true;
- while(redo) {
- redo = false;
- for(Waiting w : waiting.getAll(owner)) {
- if (w.parent==parent || (parent!=null&&w.parent!=null&&w.parent.phase()==parent.phase())) {
- waiting.remove(owner, w);
- w.perform();
- redo = true;
- break;
- }
- }
- }
- }
- }
-
- private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) {
- if (p.merge(parent, pending)) return true;
- p.parents().add(parent, true);
- if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent);
- return true;
- }
-
- private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) {
- do {
- if (token != null && state.canShift(token)) break;
- if (state.isAccepting()) break;
- if (token==null) break;
- if (!state.canReduce(token)) return false;
- //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); // ALLOC
- if (reducing) {
- n.performEmptyReductions();
- if (!fromEmptyReduction) n.performReductions(parent);
- }
- return true;
- }
-
- /** perform all reduction operations */
- public void reduce() throws ParseFailed {
- try {
- reducing = true;
- if (reducing_list==null || reducing_list.length < hash.size())
- reducing_list = new Phase.Node[hash.size() * 4];
- hash.toArray(reducing_list);
- int num = hash.size();
- for(int i=0; inext */
- public void shift(Phase next, Forest result) throws ParseFailed {
+ private void shift(Phase next, Forest f) throws ParseFailed {
+ this.next = next;
// this massively improves GC performance
- if (prev!=null && parser.helpgc) {
+ if (prev != null) {
+ IntPairMap h = prev.hash;
prev.hash = null;
+ prev.performed = null;
+ for(StateNode n : h) n.check();
}
- this.next = next;
- closed = true;
- Forest res = null;
- boolean ok = false;
- for(Phase.Node n : hash.values()) {
- if (token == null && n.state.isAccepting()) {
+ numOldNodes = hash.size();
+ for(StateNode n : hash) {
+ if (token == null && n.state().isAccepting()) {
if (finalResult==null) finalResult = new Forest.Many();
- for(Object f : n.results())
- finalResult.merge((Forest)f);
+ for(ResultNode r : n)
+ finalResult.merge(r.getForest());
}
if (token == null) continue;
- n.state.invokeShifts(token, this, result, n);
+ n.state().invokeShifts(token, this, n, f);
+ }
+ numNewNodes = next==null ? 0 : next.hash.size();
+ viewPos = this.pos;
+
+ if (!good && token!=null) {
+ String toks = token+"";
+ if (toks.length()==1 && toks.charAt(0) == edu.berkeley.sbp.chr.CharAtom.left) {
+ ParseFailed.error("unexpected increase in indentation", this,
+ token, getRegionFromThisToNext());
+ } else if (toks.length()==1 && toks.charAt(0) == edu.berkeley.sbp.chr.CharAtom.right) {
+ ParseFailed.error("unexpected decrease in indentation", this,
+ token, getRegionFromThisToNext());
+ } else {
+ ParseFailed.error("unexpected character '"+ANSI.cyan(StringUtil.escapify(token+"",
+ "\\\'\r\n"))+"'",
+ this, token, getRegionFromThisToNext());
+ }
}
-
- if (!good && token!=null)
- ParseFailed.error("unexpected character",
- getLocation(),
- token,
- hash.values(),
- getRegion(),
- input,
- GSS.this);
-
if (token==null && finalResult==null)
- ParseFailed.error("unexpected end of file",
- getLocation(),
- token,
- hash.values(),
- getLocation().createRegion(getLocation()),
- input,
- GSS.this);
+ ParseFailed.error("unexpected end of file", this, null,
+ getLocation().createRegion(getLocation()));
+ for(StateNode n : hash) n.check();
}
-
- class Waiting {
- Node parent;
- Forest pending;
- State state;
- boolean fromEmptyReduction;
- Position reduction;
- public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
- waits++;
- this.parent = parent;
- this.pending = pending;
- this.state = state;
- this.fromEmptyReduction = fromEmptyReduction;
- this.reduction = reduction;
- }
- public void perform() {
- //System.out.println("performing: " + reduction.position);
- newNode(parent, pending, state, fromEmptyReduction, reduction);
- }
+ Input.Region getRegionFromThisToNext() {
+ return getLocation().createRegion(getNextLocation());
}
-
- // Node /////////////////////////////////////////////////////////////////////////////////
-
- /** a node in the GSS */
- final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz {
- public FastSet set = new FastSet();
-
-
- private boolean allqueued = false;
-
- /** 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; }
-
- private HashSet resultMap = new HashSet();
- public Iterable results() { return resultMap; }
- public FastSet parents() { return set; }
- public boolean merge(Node parent, Forest result) {
- // FIXME: inefficient!
- for(Forest.Many f : results()) {
- if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
- f.merge(result);
- return true;
- }
- }
- Forest.Many f = new Forest.Many();
- f.parents.add(parent);
- f.merge(result);
- resultMap.add(f);
- set.add(parent, true);
- return false;
- }
-
- public void performReductions() {
- if (allqueued) return;
- allqueued = true;
- state.invokeReductions(token, this, this, null);
- }
-
- public void performReductions(Node n2) {
- if (!allqueued) performReductions();
- else state.invokeReductions(token, this, this, n2);
- }
-
- public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
- public final void invoke(Position r, Node n, Node n2) {
- reductions++;
- 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.pos];
- if (r.pos==0) n.finish(r, r.zero(n.phase().getLocation().createRegion(n.phase().getLocation())), n.phase());
- else n.reduce(r, r.pos-1, n.phase(), null);
- } else {
- if (r.pos<=0) throw new Error("called wrong form of reduce()");
- int pos = r.pos-1;
- n.reduce(r, pos, n.phase(), n2);
- }
- }
-
- public void reduce(Position r, int pos, Phase target, Node only) {
- Forest[] holder = r.holder;
- Forest old = holder[pos];
- HashSet rr = new HashSet();
- for(Forest result : results()) rr.add(result);
- for(Forest result : rr)
- for(Node child : ((Forest.Many>)result).parents) {
- if (only != null && child!=only) continue;
- holder[pos] = result;
- if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(target.getLocation())), target);
- else child.reduce(r, pos-1, target, null);
- }
-
- holder[pos] = old;
- }
-
- public void finish(Position r, Forest result, Phase target) {
- 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);
- }
-
- private Node(Node parent, Forest pending, State state) {
- this.state = state;
- this.merge(parent, pending);
- Phase start = parent==null ? null : parent.phase();
- if (parent != null) parents().add(parent, true);
- 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++;
-
- // GraphViz //////////////////////////////////////////////////////////////////////////////
+ void newNodeFromReduction(Forest f, Pos reduction, StateNode pred) {
+ int pos = pred.phase().pos;
+ for(int s : reduction.hates())
+ if (performed.contains(pos, s))
+ return;
+ for(int s : reduction.needs())
+ if (!performed.contains(pos, s))
+ return;
+ if (reduction.owner_needed_or_hated() && !performed.contains(pos, reduction.provides()))
+ performed.add(pos, reduction.provides());
+ Parser.Table.State state = (Parser.Table.State)pred.state().gotoSetNonTerminals.get(reduction);
+ if (state!=null)
+ newNode(f, reduction, pred, state);
+ }
- public GraphViz.Node toGraphViz(GraphViz gv) {
- if (gv.hasNode(this)) return gv.createNode(this);
- GraphViz.Node n = gv.createNode(this);
- n.label = ""+state.toStringx();
- n.shape = "rectangle";
- n.fill = "green";
- for(Forest result : results()) n.edge(result, "");
- for(Node parent : parents()) n.edge(parent, "");
- ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
- return n;
+ /** add a new node (merging with existing nodes if possible)
+ * @param parent the parent of the new node
+ * @param result the SPPF result corresponding to the new node
+ * @param state the state that the new node is in
+ * @param start the earliest part of the input contributing to this node (used to make merging decisions)
+ */
+ private boolean newNode(Forest f, Pos reduction, StateNode pred, State state) {
+ StateNode p = pred==null ? null : hash.get(state, pred.phase());
+ if (p != null) {
+ p.addPred(f, reduction, pred);
+ return !state.doomed();
}
- public boolean isTransparent() { return false; }
- public boolean isHidden() { return false; }
-
+ do {
+ // optimizations
+ if (token != null && state.canShift(token)) break;
+ if (state.isAccepting()) break;
+ if (token==null) break;
+ if (!state.canReduce(token)) return false;
+ } while(false);
+ StateNode n = new StateNode(Phase.this, new ResultNode(f, reduction, pred), state); // ALLOC
+ /** FIXME: this null-result can be used to notice bogus/dead states */
+ for(Object s : state.conjunctStates)
+ newNode(null, null, n, (State)s);
+ return !n.state().doomed();
}
- private int node_idx = 0;
public int toInt() { return pos+1; }
public int size() { return hash==null ? 0 : hash.size(); }
+ public int pos() { return pos; }
+ public Tok getToken() { return token; }
+ //public Iterator iterator() { return hash.iterator(); }
+ public GSS getGSS() { return GSS.this; }
// GraphViz //////////////////////////////////////////////////////////////////////////////
- public GraphViz.Node toGraphViz(GraphViz gv) {
+ public GraphViz.StateNode toGraphViz(GraphViz gv) {
if (gv.hasNode(this)) return gv.createNode(this);
GraphViz.Group g = gv.createGroup(this);
g.label = "Phase " + pos;
@@ -430,5 +225,19 @@ class GSS {
public boolean isTransparent() { return false; }
public boolean isHidden() { return false; }
+ public void dumpGraphViz(String filename) throws IOException {
+ FileOutputStream fos = new FileOutputStream(filename);
+ PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
+ GraphViz gv = new GraphViz();
+ /*
+ for(Object n : this)
+ ((StateNode)n).toGraphViz(gv);
+ */
+ gv.dump(p);
+ p.flush();
+ p.close();
+ }
+
}
+
}