X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=89a16ed8c5c3e9b22e07be5fe5d7e1aa7ed1d6f0;hp=86c93b2170b0f37544741e8d91a051c31441da05;hb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;hpb=8af721961520fe30057c3e0a0c7b68ded356e5c2 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 86c93b2..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,33 +16,39 @@ class GSS { public int resets = 0; public int waits = 0; - HashMapBag inhibited = new HashMapBag(); - HashMapBag waiting = new HashMapBag(); - HashMapBag performed = new HashMapBag(); + 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 class Phase implements Invokable.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 hash; /* ALLOC */ + private IntPairMap 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; @@ -58,6 +63,9 @@ class GSS { waiting.clear(); performed.clear(); hash = new IntPairMap(); + singularReductions = new IntPairMap(); + expectedInhibit.clear(); + expectedInhibit.addAll(inhibited); good = false; closed = false; reducing = false; @@ -73,7 +81,7 @@ class GSS { 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 @@ -87,9 +95,9 @@ class GSS { 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) @@ -154,14 +162,14 @@ 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); //inhibited = new HashMapBag(); @@ -170,6 +178,7 @@ class GSS { throw new Reset(); } inhibited.add(p, seq); + expectedInhibit.remove(p, seq); } } @@ -191,6 +200,11 @@ class GSS { 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(); @@ -199,14 +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 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; @@ -221,7 +234,10 @@ class GSS { } 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()), @@ -234,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; @@ -252,13 +268,13 @@ class GSS { // Node ///////////////////////////////////////////////////////////////////////////////// /** a node in the GSS */ - public final class Node extends FastSet implements Invokable { + public final class Node extends FastSet implements Invokable, IntegerMappable { 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; } @@ -277,33 +293,64 @@ class GSS { 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 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; @@ -313,7 +360,10 @@ class GSS { 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(); }