+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
package edu.berkeley.sbp;
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
int resets = 0;
int waits = 0;
- public GSS() { }
+ Input input;
+
+ public GSS(Input input) { this.input = input; }
private Phase.Node[] reducing_list = null;
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, Forest forest) throws ParseFailed {
+ 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();
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 boolean isDone() throws ParseFailed {
if (token != null) return false;
if (token==null && finalResult==null)
- throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()), getLocation());
+ ParseFailed.error("unexpected end of file",
+ getLocation(),
+ token,
+ hash.values(),
+ getLocation().createRegion(getLocation()),
+ input,
+ GSS.this);
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
}
}
}
- if (!owner.lame)
- newNode(parent, pending, state, fromEmptyReduction);
+ newNode(parent, pending, state, fromEmptyReduction);
if (reduction != null) {
boolean redo = true;
while(redo) {
return true;
}
+ LinkedList<Node> reductionQueue = new LinkedList<Node>();
+
/** perform all reduction operations */
public void reduce() throws ParseFailed {
try {
// INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
}
for(int i=0; i<num; i++) {
- Node n = reducing_list[i];
+ reductionQueue.add(reducing_list[i]);
reducing_list[i] = null;
- n.performReductions();
+ }
+ while(!reductionQueue.isEmpty()) {
+ reductionQueue.remove().performReductions();
}
if (reset) {
reset = false;
}
if (!good && token!=null)
- 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());
+ ParseFailed.error("unexpected character",
+ getLocation(),
+ token,
+ hash.values(),
+ getRegion(),
+ input,
+ GSS.this);
+
if (token==null && finalResult==null)
- throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
- getLocation());
+ ParseFailed.error("unexpected end of file",
+ getLocation(),
+ token,
+ hash.values(),
+ getLocation().createRegion(getLocation()),
+ input,
+ GSS.this);
}
/** a node in the GSS */
final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
public FastSet<Node> set = new FastSet<Node>();
-
-
private boolean allqueued = false;
/** what state this node is in */
}
public void performReductions(Node n2) {
- if (!allqueued) performReductions();
+ if (!allqueued) reductionQueue.add(this);//performReductions();
else state.invokeReductions(token, this, this, n2);
}
}
if (n==null) return;
Forest[] holder = new Forest[r.pos];
- if (r.pos==0) n.finish(r, r.zero(), n.phase());
+ 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()");
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(phase().getLocation())), target);
+ if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(target.getLocation())), target);
else child.reduce(r, pos-1, target, null);
}