X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=743cfd381622afc430958b743fe5ac622ccb203a;hp=d25593ffb592e393f0f3ce70e811671c23921c7f;hb=225993309e6183afa9a88fc13d39df56be54b992;hpb=3473141880127c6aa52d094d51739e5eb67f1703 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index d25593f..743cfd3 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -10,22 +10,23 @@ 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 expectedInhibit = 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.Node>, IntegerMappable { + class Phase implements Invokable.Node>, IntegerMappable { public void invoke(State st, Forest result, Node n) { good |= next.newNode(n, result, st, false); @@ -43,29 +44,31 @@ class GSS { 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, Tok 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(); - expectedInhibit.clear(); - expectedInhibit.addAll(inhibited); + reset = false; good = false; closed = false; reducing = false; @@ -81,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 @@ -99,21 +102,35 @@ class GSS { int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos; 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) { @@ -156,34 +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(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.owner().hated) { - if (performed.contains(p,seq)) { - uninhibit(p, seq); - //System.out.println("\nresetting due to " + r.owner() + " killing " + seq); - //inhibited.clear(); - inhibited.add(p, seq); - //inhibited = new HashMapBag(); - reset = true; - resets++; - throw new Reset(); - } - inhibited.add(p, seq); - expectedInhibit.remove(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()) @@ -200,17 +191,26 @@ class GSS { reducing_list[i] = null; n.performReductions(); } - if (expectedInhibit.size() > 0) { - inhibited.removeAll(expectedInhibit); - System.out.println("\n!!!!\n"); + 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 { } /** perform all shift operations, adding promoted nodes to next */ @@ -234,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()), @@ -242,7 +245,7 @@ class GSS { } - public class Waiting { + class Waiting { Node parent; Forest pending; State state; @@ -265,7 +268,7 @@ class GSS { // Node ///////////////////////////////////////////////////////////////////////////////// /** a node in the GSS */ - public final class Node extends FastSet implements Invokable, IntegerMappable { + final class Node extends FastSet implements Invokable, IntegerMappable { private Forest.Ref holder = null; private boolean allqueued = false; @@ -290,6 +293,7 @@ class GSS { 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) { if (n==null || n2==null || r.pos==0) { if (r.pos==0) { @@ -304,39 +308,33 @@ class GSS { 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; + n.reduce(r, pos, n.phase(), holder, n2); } } - public void reduce(Position r, int pos, Phase target, Forest[] holder) { + 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