/** An "ambiguity node"; this is immutable once it has been "looked at" */
static class Many<NodeType> extends Forest<NodeType> {
- HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
+ HashSet<Node> parents = new HashSet<Node>();
private FastSet<Forest<NodeType>> hp = new FastSet<Forest<NodeType>>();
private boolean touched = false;
/** implements Tomita's Graph Structured Stack */
class GSS {
- static int count = 0;
+ public static Queue<Node> removals = new LinkedList<Node>();
+
+ static String note = "";
+ static int single_newnode = 0;
+ static int toplevel_reductions = 0;
+ static int multi_newnode = 0;
+ static int waiting_newnode = 0;
static int shifts = 0;
+
+ static int count = 0;
static int reductions = 0;
int resets = 0;
int waits = 0;
public GSS(Input input) { this.input = input; }
- private Phase.Node[] reducing_list = null;
+ private Node[] reducing_list = null;
// FIXME: right now, these are the performance bottleneck
HashMapBag<Sequence,Phase.Waiting> waiting = new HashMapBag<Sequence,Phase.Waiting>();
Forest.Many finalResult;
/** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
- class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
+ class Phase<Tok> implements Invokable<State, Forest, Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Node> {
- public Iterator<Phase.Node> iterator() { return hash.iterator(); }
+ public int pos() { return pos; }
+ public boolean closed() { return closed; }
+ public Tok token() { return token; }
+
+ public Iterator<Node> iterator() { return hash.iterator(); }
public void invoke(State st, Forest result, Node n) {
shifts++;
good |= next.newNode(n, result, st, false);
private final int pos;
boolean reducing;
- private IntPairMap<Phase.Node> hash; /* ALLOC */
+ public IntPairMap<Node> hash; /* ALLOC */
private boolean closed;
private boolean good;
private Phase next = null;
lastperformed.clear();
lastperformed.addAll(performed);
performed.clear();
- hash = new IntPairMap<Phase.Node>();
+ hash = new IntPairMap<Node>();
reset = false;
good = false;
closed = false;
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);
+ p.addParent(parent, true);
if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent);
return true;
}
//return;
} while(false);
- Node n = new Node(parent, pending, state); // ALLOC
+ Node n = new Node(Phase.this, parent, pending, state); // ALLOC
if (reducing) {
n.performEmptyReductions();
if (!fromEmptyReduction) n.performReductions(parent);
return true;
}
- LinkedList<Node> reductionQueue = new LinkedList<Node>();
+ public LinkedList<Node> reductionQueue = new LinkedList<Node>();
/** 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];
+ reducing_list = new Node[hash.size() * 4];
hash.toArray(reducing_list);
int num = hash.size();
for(int i=0; i<num; i++) {
public void shift(Phase next, Forest result) throws ParseFailed {
// this massively improves GC performance
if (prev!=null && parser.helpgc) {
- prev.hash = null;
+ //prev.hash = null;
+ //System.out.println("\r" + /*shifts + " " + */ single_newnode /*+ "/"+multi_newnode + " " + waiting_newnode*/);
+ //System.out.println("\r" + shifts + " " + note);
+ //System.out.println("\r" + shifts);
+ //System.out.println("\r" + toplevel_reductions);
+ //System.out.println("\r" + multi_newnode);
+ single_newnode = 0;
+ note = "";
+ multi_newnode = 0;
+ toplevel_reductions = 0;
+ waiting_newnode = 0;
+ shifts = 0;
}
this.next = next;
closed = true;
Forest res = null;
boolean ok = false;
- for(Phase.Node n : hash.values()) {
- if (token == null && n.state.isAccepting()) {
+ int count = 0;
+ for(Node n : hash.values()) {
+ if (token == null && n.state().isAccepting()) {
if (finalResult==null) finalResult = new Forest.Many();
for(Object f : n.results())
finalResult.merge((Forest)f);
}
if (token == null) continue;
- n.state.invokeShifts(token, this, result, n);
+ n.state().invokeShifts(token, this, result, n);
}
-
+ //System.out.println(next.hash.size());
if (!good && token!=null)
ParseFailed.error("unexpected character",
getLocation(),
}
public void perform() {
//System.out.println("performing: " + reduction.position);
+ waiting_newnode++;
newNode(parent, pending, state, fromEmptyReduction, reduction);
}
}
- // Node /////////////////////////////////////////////////////////////////////////////////
-
- /** 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 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; }
-
- private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
- public Iterable<Forest.Many> results() { return resultMap; }
- public FastSet<Node> 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) reductionQueue.add(this);//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<Forest> rr = new HashSet<Forest>();
- 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<Tok> target) {
- 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;
- 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 //////////////////////////////////////////////////////////////////////////////
-
- 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;
- }
- public boolean isTransparent() { return false; }
- public boolean isHidden() { return false; }
-
- }
- private int node_idx = 0;
public int toInt() { return pos+1; }
public int size() { return hash==null ? 0 : hash.size(); }
public boolean isHidden() { return false; }
}
+
}
--- /dev/null
+// 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.*;
+import edu.berkeley.sbp.Parser.Table.*;
+import edu.berkeley.sbp.Sequence.Position;
+import java.io.*;
+import java.util.*;
+import java.lang.reflect.*;
+
+/** a node in the GSS */
+final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
+
+ public static int node_idx = 0;
+
+ private final GSS.Phase phase;
+
+ public FastSet<Node> setx = new FastSet<Node>();
+ public FastSet<Node> childs = new FastSet<Node>();
+
+ private boolean allqueued = false;
+
+ /** what state this node is in */
+ public final Parser.Table.State state;
+
+ /** which GSS.Phase this Node belongs to (node that Node is also a non-static inner class of GSS.Phase) */
+ public GSS.Phase phase() { return phase; }
+
+ private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
+ public Iterable<Forest.Many> results() { return resultMap; }
+ public Iterable<Node> parents() { return setx; }
+ public void addParent(Node n, boolean b) {
+ if (n==null) return;
+ setx.add(n, b);
+ n.childs.add(this, true);
+ //else
+ //System.out.println("************ evilstate: " + this);
+ }
+ 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);
+ addParent(parent, true);
+ return false;
+ }
+
+ public void performReductions() {
+ if (allqueued) return;
+ allqueued = true;
+ state.invokeReductions(phase().token(), this, this, null);
+ }
+
+ public void performReductions(Node n2) {
+ if (!allqueued) phase().reductionQueue.add(this);//performReductions();
+ else state.invokeReductions(phase().token(), this, this, n2);
+ }
+
+ public Parser.Table.State state() { return state; }
+
+ public void performEmptyReductions() { state.invokeReductions(phase().token, this, null, null); }
+ public final void invoke(Position r, Node n, Node n2) {
+ //reductions++;
+ //if (r.pos==1) single_newnode++;
+ //if (r.pos>1) multi_newnode++;
+ 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, GSS.Phase target, Node only) {
+ Forest[] holder = r.holder;
+ Forest old = holder[pos];
+
+ //toplevel_reductions++;
+ HashSet<Forest> rr = new HashSet<Forest>();
+ for(Forest result : results()) {
+ rr.add(result);
+ }
+ //System.out.println(r);
+ 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, GSS.Phase target) {
+ Parser.Table.State state0 = (Parser.Table.State)state.gotoSetNonTerminals.get(r.owner());
+ if (result==null) throw new Error();
+ if (state0!=null)
+ target.newNode(this, result, state0, r.pos<=0, r);
+ }
+
+ Node(GSS.Phase phase, Node parent, Forest pending, State state) {
+ this.phase = phase;
+ this.state = state;
+ this.merge(parent, pending);
+ GSS.Phase start = parent==null ? null : parent.phase();
+ if (parent != null) addParent(parent, true);
+ if (phase.hash.get(state, start) != null) throw new Error("severe problem!");
+ phase.hash.put(state, start, this);
+ }
+ public int toInt() { return idx; }
+ private final int idx = node_idx++;
+
+ // GraphViz //////////////////////////////////////////////////////////////////////////////
+
+ 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";
+ boolean hasparents = false;
+ for(Node parent : parents()) { hasparents = true; n.edge(parent, ""); }
+ for(Forest result : results()) n.edge(result, "");
+ n.color = !hasparents ? "blue" : /*state.evil ? "red" :*/ "green";
+ ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
+ return n;
+ }
+ public boolean isTransparent() { return false; }
+ public boolean isHidden() { return false; }
+
+}
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.Sequence.Position;
import edu.berkeley.sbp.GSS.Phase;
-import edu.berkeley.sbp.GSS.Phase.Node;
+import edu.berkeley.sbp.Node;
import edu.berkeley.sbp.util.*;
import java.io.*;
import java.util.*;
return (c >= 'A' && c <= 'Z');
}
- static <Tok> void barf(HashMap<Element,Input.Location> sb, GSS.Phase<Tok>.Node n, int indent, boolean skip, int count, Input.Location loc) {
+ static <Tok> void barf(HashMap<Element,Input.Location> sb, Node n, int indent, boolean skip, int count, Input.Location loc) {
if (count <= 0) {
barf(sb, n, indent, skip, loc);
} else {
- for(GSS.Phase<Tok>.Node nn : n.parents())
+ for(Node nn : (Iterable<Node>)n.parents())
barf(sb, nn, indent, skip, count-1, n.phase().getLocation());
}
}
- static <Tok> void barf(HashMap<Element,Input.Location> sb, GSS.Phase<Tok>.Node n, int indent, boolean skip, Input.Location loc) {
+ static <Tok> void barf(HashMap<Element,Input.Location> sb, Node n, int indent, boolean skip, Input.Location loc) {
if (touched.contains(n)) return;
touched.add(n);
String s = "";
for(int i=0; i< indent; i++) s += " ";
- GSS.Phase<Tok>.Node parent = n;
+ Node parent = n;
boolean done = false;
boolean alldone = false;
boolean go = false;
boolean force = false;
- for(Position p : parent.state) {
+ for(Position p : (Iterable<Position>)parent.state()) {
if (skip) p = p.next();
int raise = 0;
done = false;
// FIXME
- private static HashSet<GSS.Phase.Node> touched = new HashSet<GSS.Phase.Node>();
- static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force, int indent) {
+ private static HashSet<Node> touched = new HashSet<Node>();
+ static <Tok> void complain(Node n, HashMap<String,HashSet<String>> errors, boolean force, int indent) {
if (touched.contains(n)) return;
touched.add(n);
- for(Position p : n.state) {
+ for(Position p : (Iterable<Position>)n.state()) {
//if (!p.isLast() && !p.next().isLast()) continue;
if (((p.isFirst() || p.isLast()) && !force)/* || p.owner().name==null*/ ||
!important(p)) {
PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
GraphViz gv = new GraphViz();
for(Object n : next)
- ((GSS.Phase.Node)n).toGraphViz(gv);
+ ((Node)n).toGraphViz(gv);
gv.dump(p);
p.flush();
p.close();
}
public Sequence build(Context cx, Union u, NonTerminalNode cnt) {
Sequence ret = build0(cx, cnt);
- for(Seq s : and) { Sequence dork = s.build(cx, u, cnt); ret = ret.and(dork); }
- for(Seq s : not) { Sequence dork = s.build(cx, u, cnt); ret = ret.andnot(dork); }
- u.add(ret);
+ for(Seq s : and) { Sequence dork = s.build(cx, null, cnt); ret = ret.and(dork); }
+ for(Seq s : not) { Sequence dork = s.build(cx, null, cnt); ret = ret.andnot(dork); }
+ if (u!=null) u.add(ret);
return ret;
}
public Sequence build0(Context cx, NonTerminalNode cnt) {
public class HaskellHelper {
+ public static void main(String[] argv) throws Throwable {
+ main(argv[0], argv[1]);
+ }
public static Tree main(String grammarFile, String targetFile) throws Throwable {
try {
Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(grammarFile)).expand1();
| WSB:: " "++
}
+//testcase {
+// input "aaaaaXaaaa";
+// output "";
+// s = ManyA &~ EndsWithZ
+// EndsWithZ = Anything "Z"
+// ManyA = () | "a" ManyA
+// Anything = () | ("a" | "X" | "Z") Anything
+//}
+
+testcase {
+ input "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+ output "";
+ s = ManyA
+ ManyA = ()
+ | A ManyA! & ManyAB
+ A = "a"
+ ManyAB = ()
+ | "a" ManyAB
+ | "b" ManyAB
+}
+
+testcase {
+ input "aaaaaaaa";
+ output "";
+ s = As & AAs
+ As = () | As "a"
+ AAs = () | AAs "aa"
+}
+
+
projects / sbp.git / commitdiff