X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=743cfd381622afc430958b743fe5ac622ccb203a;hb=225993309e6183afa9a88fc13d39df56be54b992;hp=5feba84a0b935984625efaed044aa75b6b5b4129;hpb=1b46ed935f0fb6fb18afd40f5d1771be030a5a0d;p=sbp.git diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 5feba84..743cfd3 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.*; @@ -11,53 +10,65 @@ import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ class GSS { + public static int count = 0; public GSS() { } private Phase.Node[] reducing_list = null; public int resets = 0; public int waits = 0; - HashMapBag inhibited = new HashMapBag(); - HashMapBag waiting = new HashMapBag(); - HashMapBag performed = new HashMapBag(); + HashMapBag waiting = new HashMapBag(); + HashMapBag performed = new HashMapBag(); + HashMapBag lastperformed = new HashMapBag(); + HashMapBag expected = 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 { + 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) throws ParseFailed { this.prev = prev; this.forest = forest; this.parser = parser; this.pos = previous==null ? 0 : previous.pos+1; this.token = token; this.location = location; - inhibited.clear(); + performed.clear(); reset(); } - public void reset() { + public void reset() throws ParseFailed { waiting.clear(); + expected.clear(); + lastperformed.clear(); + lastperformed.addAll(performed); performed.clear(); hash = new IntPairMap(); + singularReductions = new IntPairMap(); + reset = false; good = false; closed = false; reducing = false; @@ -73,7 +84,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,25 +98,39 @@ 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.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 ((owner.needed != null && owner.needed.size()>0) || - (owner.hated != null && owner.hated.size()>0) || - (owner.hates != null && owner.hates.size()>0)) + 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; + } + } } if (!owner.lame) newNode(parent, pending, state, fromEmptyReduction); - if (reduction!=null) inhibit(reduction, parent==null?0:parent.phase().pos); if (reduction != null) { boolean redo = true; while(redo) { @@ -148,33 +173,8 @@ class GSS { return true; } - public void uninhibit(int p, Sequence s) { - if (s.hated!=null) - for(Sequence s2 : s.hated) - inhibited.remove(p, s2); - } - - public void inhibit(Reduction r, int p) { - if (r.position.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) { - if (performed.contains(p,seq)) { - uninhibit(p, seq); - //System.out.println("\nresetting due to " + r.position.owner() + " killing " + seq); - //inhibited.clear(); - inhibited.add(p, seq); - //inhibited = new HashMapBag(); - reset = true; - resets++; - throw new Reset(); - } - inhibited.add(p, seq); - } - } - /** perform all reduction operations */ - public void reduce() { + public void reduce() throws ParseFailed { try { reducing = true; if (reducing_list==null || reducing_list.length < hash.size()) @@ -191,22 +191,35 @@ class GSS { reducing_list[i] = null; n.performReductions(); } + if (reset) { + reset = false; + resets++; + throw new Reset(); + } + for(int i : expected) + for(Sequence s : expected.getAll(i)) + if (!performed.contains(i, s)) { + //System.out.println("resetting due to pos="+i+": " + s + " " + System.identityHashCode(s)); + resets++; + throw new Reset(); + } } catch (Reset r) { reset(); reduce(); } + count = 0; } + private boolean reset = false; 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()), @@ -229,13 +245,13 @@ class GSS { } - public class Waiting { + class Waiting { Node parent; 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 { + 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,42 +293,59 @@ 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) n.finish(r, 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 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()); - n2.finish(r, rex, n.phase(), holder); - } else { - r.reduce(n2, pos-1, n.phase(), holder); + Forest[] holder = new Forest[r.pos]; + if (r.pos<=0) throw new Error("called wrong form of reduce()"); + int pos = r.pos-1; + n.reduce(r, pos, n.phase(), holder, n2); + } + } + + public void reduce(Position r, int pos, Phase target, Forest[] holder) { reduce(r, pos, target, holder, null); } + public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { + 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.position.pos<=0, r); + target.newNode(this, result, state0, r.pos<=0, r); } - public void performEmptyReductions() { state.invokeReductions(token, this, null, null); } - private Node(Node parent, Forest pending, State state) { this.state = state; this.holder().merge(pending); @@ -321,7 +354,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(); }