X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=89a16ed8c5c3e9b22e07be5fe5d7e1aa7ed1d6f0;hp=a8f8053e439f796072d977525956adb832a2551a;hb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;hpb=3eb9fa560dee4f8c3b3af0460ff850d755676d81 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index a8f8053..89a16ed 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.*; @@ -17,44 +16,39 @@ class GSS { public int resets = 0; public int waits = 0; - HashMapBag inhibited = new HashMapBag(); - HashMapBag assumed = new HashMapBag(); - HashMapBag waiting = new HashMapBag(); - HashMapBag performed = new HashMapBag(); - HashSet tail = new HashSet(); + HashMapBag inhibited = new HashMapBag(); + HashMapBag expectedInhibit = new HashMapBag(); + HashMapBag waiting = new HashMapBag(); + HashMapBag performed = new HashMapBag(); + /** FIXME */ + 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 int toInt() { return pos+1; } + public class Phase implements Invokable.Node>, IntegerMappable { - /** the token immediately after this phase */ - public final Token token; + public void invoke(State st, Forest result, Node n) { + good |= next.newNode(n, result, st, false); + } - boolean reducing; + /** the token immediately after this phase */ + final Tok token; - /** currently this is necessary only for the code() hack -- it doesn't actually correspond to the input */ private final int pos; - /** FIXME */ - public Forest.Ref finalResult; - - /** all nodes, keyed by the value returned by code() */ - /*private*/ HashMap hash; /* ALLOC */ - - /** the number of nodes in this phase */ - private int numNodes; - - boolean closed; - + boolean reducing; + private IntPairMap hash; /* ALLOC */ + private IntPairMap singularReductions; /* ALLOC */ + private boolean closed; private boolean good; private Phase next = null; - - private Token.Location location; + private Phase prev; + private Input.Location location; public final Parser parser; private Forest forest; - Phase prev; - 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; @@ -62,104 +56,32 @@ class GSS { this.token = token; this.location = location; inhibited.clear(); - assumed.clear(); reset(); } public void reset() { - tail.clear(); waiting.clear(); performed.clear(); - hash = new HashMap(); + hash = new IntPairMap(); + singularReductions = new IntPairMap(); + expectedInhibit.clear(); + expectedInhibit.addAll(inhibited); good = false; closed = false; - numNodes = 0; reducing = false; finalResult = null; if (prev != null) prev.shift(this, forest); } - public void complain(Node n, HashMap> errors, boolean force) { - if (n.touched) return; - n.touched = true; - for(Position p : n.state) { - //if (!p.isLast()) { - if (((p.isFirst() || p.isLast()) && !force) || p.owner().name==null) { - for(Node n2 : n.parents()) - complain(n2, errors, force | p.isFirst()); - } else { - String seqname = p.owner().name; - HashSet hs = errors.get(seqname); - if (hs==null) errors.put(seqname, hs = new HashSet()); - hs.add(p.element()+""); - //String s = " while parsing " + seqname + ": expected a " + p.element(); - //"\n"; - /* - s += " parsed: "; - for(Position p2 = p.owner().firstp(); p2 != null && p2 != p && !p2.isLast(); p2 = p2.next()) s += (p2.element() + " "); - s += "\n"; - s += " expected: "; - for(Position p2 = p; p2 != null && !p2.isLast(); p2 = p2.next()) s += (p2.element() + " "); - */ - //s += "\n"; - //errors.add(s); - } - } - } - - public String black(Object o) { return "\033[30m"+o+"\033[0m"; } - public String red(Object o) { return "\033[31m"+o+"\033[0m"; } - public String green(Object o) { return "\033[32m"+o+"\033[0m"; } - public String yellow(Object o) { return "\033[33m"+o+"\033[0m"; } - public String blue(Object o) { return "\033[34m"+o+"\033[0m"; } - public String purple(Object o) { return "\033[35m"+o+"\033[0m"; } - public String cyan(Object o) { return "\033[36m"+o+"\033[0m"; } - public String el(Object e) { - String s = e.toString(); - if (s.length()==0 || s.charAt(0)!='\"' || s.charAt(s.length()-1)!='\"') return yellow(s); - s = s.substring(1); - s = s.substring(0, s.length()-1); - StringBuffer ret = new StringBuffer(); - for(int i=0; i" : token.toString(); - StringBuffer ret = new StringBuffer(); - ret.append("\n "); - ret.append(message); - HashMap> errors = new HashMap>(); - for(Node n : hash.values()) complain(n, errors, false); - for(String s : errors.keySet()) { - ret.append(" while parsing " + yellow(s)); - HashSet hs = errors.get(s); - if (hs.size()==1) ret.append(" expected " + yellow(el(hs.iterator().next())) + "\n"); - else { - ret.append(" expected "); - boolean first = true; - for(String s2 : hs) { - if (!first) ret.append(" or "); - first = false; - ret.append(yellow(el(s2))); - } - ret.append("\n"); - } - } - return ret.toString(); - } - - public boolean isDone() throws Parser.Failed { + + public boolean isDone() throws ParseFailed { if (token != null) return false; if (token==null && finalResult==null) - throw new Parser.Failed(error(red("unexpected end of file\n")), - getLocation()); + throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()), getLocation()); 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 @@ -169,21 +91,15 @@ class GSS { * @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(code(state, parent==null?null:parent.phase())); + 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, 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 (assumed.contains(pos, owner)) { - tail.add(new Waiting(parent, pending, state, fromEmptyReduction, reduction)); - return; - } - */ if (owner.needs != null) for(Sequence s : owner.needs) if (!performed.contains(pos, s)) { @@ -217,7 +133,7 @@ class GSS { p.holder.merge(pending); if (p.parents().contains(parent)) return true; p.parents().add(parent, true); - if (p!=parent && !fromEmptyReduction) p.queueReductions(parent); + if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; } private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) { @@ -225,16 +141,18 @@ class GSS { if (token != null && state.canShift(token)) break; if (state.isAccepting()) break; if (token==null) break; - //if (!state.canReduce(token)) return false; + 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, fromEmptyReduction); // ALLOC - n.queueEmptyReductions(); - if (!fromEmptyReduction) n.queueReductions(parent); + Node n = new Node(parent, pending, state); // ALLOC + if (reducing) { + n.performEmptyReductions(); + if (!fromEmptyReduction) n.performReductions(parent); + } return true; } @@ -244,23 +162,23 @@ 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); - //assumed = inhibited; //inhibited = new HashMapBag(); reset = true; resets++; throw new Reset(); } inhibited.add(p, seq); + expectedInhibit.remove(p, seq); } } @@ -270,21 +188,23 @@ class GSS { reducing = true; if (reducing_list==null || reducing_list.length < hash.size()) reducing_list = new Phase.Node[hash.size() * 4]; - Collection hv = hash.values(); - hv.toArray(reducing_list); - int num = hv.size(); + hash.toArray(reducing_list); + int num = hash.size(); for(int i=0; i 0) { + inhibited.removeAll(expectedInhibit); + System.out.println("\n!!!!\n"); + throw new Reset(); } - //for(Waiting w : tail) - //w.perform(); } catch (Reset r) { reset(); reduce(); @@ -293,13 +213,13 @@ 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 Parser.Failed { - if (prev!=null) prev.hash = null; + public void shift(Phase next, Forest result) throws ParseFailed { + // this massively improves GC performance + if (prev!=null) { + prev.hash = null; + prev.singularReductions = null; + } this.next = next; closed = true; Forest res = null; @@ -314,14 +234,14 @@ class GSS { } if (!good && token!=null) - throw new Parser.Failed(error(red("unexpected character")+" "+purple(token)+" encountered at "+green(getLocation())+"\n"), + 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 Parser.Failed(error(red("unexpected end of file\n")), + throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()), getLocation()); - - // this massively improves GC performance - //hash = null; } @@ -330,8 +250,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; @@ -345,78 +265,108 @@ class GSS { } } - // GSS Nodes ////////////////////////////////////////////////////////////////////////////// + // Node ///////////////////////////////////////////////////////////////////////////////// /** a node in the GSS */ - public final class Node extends FastSet implements Invokable { + public final class Node extends FastSet implements Invokable, IntegerMappable { - public boolean touched = false; 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; } - + public Phase phase() { return Phase.this; } public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; } public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; } public FastSet parents() { return this; } - public void queueReductions() { - if (!reducing) return; + public void performReductions() { if (allqueued) return; allqueued = true; - int where = parents().size(); state.invokeReductions(token, this, this, null); } - public void queueReductions(Node n2) { - if (!allqueued) { queueReductions(); return; } - state.invokeReductions(token, this, this, n2); + public void performReductions(Node n2) { + if (!allqueued) performReductions(); + else state.invokeReductions(token, this, this, n2); } - public final void invoke(Reduction r, Node n, Node n2) { - if (n==null) { - if (r.numPop==0) r.reduce(this); - return; + 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.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.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 = 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 { + n2.reduce(r, pos-1, n.phase(), holder); + } + holder[pos] = old; } - if (r.numPop==0) return; - if (n2==null) r.reduce(n); - else r.reduce(n, n2); } - public void queueEmptyReductions() { - if (!reducing) return; - 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 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); + } + + private Node(Node parent, Forest pending, State state) { this.state = state; this.holder().merge(pending); Phase start = parent==null ? null : parent.phase(); if (parent != null) parents().add(parent, true); - if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!"); - Phase.this.hash.put(code(state, start), this); - Phase.this.numNodes++; + 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(); } } - /** helper method */ - private static boolean equal(Object a, Object b) { - if (a==null && b==null) return true; - if (a==null || b==null) return false; - return a.equals(b); - } - - /** this is something of a hack right now */ - private static long code(State state, Phase start) { - return (((long)state.idx) << 32) | (start==null ? 0 : (start.pos+1)); - } }