X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=87bcf04b2f286203604a92494e3ba7e34945e843;hp=bd2ecd6539b2bc91963b944a48ccca080634b70c;hb=eda544585c2304faa82d249c4744fd5cecbf9211;hpb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index bd2ecd6..87bcf04 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -10,6 +10,7 @@ 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; @@ -20,12 +21,13 @@ class GSS { HashMapBag expectedInhibit = new HashMapBag(); HashMapBag waiting = new HashMapBag(); HashMapBag performed = new HashMapBag(); + HashMapBag lastperformed = 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); @@ -48,7 +50,7 @@ class GSS { private Forest forest; - public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.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; @@ -59,13 +61,16 @@ class GSS { reset(); } - public void reset() { + public void reset() throws ParseFailed { waiting.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; @@ -99,6 +104,14 @@ 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 (owner.hates!=null) { + for (Sequence s : lastperformed.getAll(pos)) + if (owner.hates.contains(s)) + return; + for (Sequence s : performed.getAll(pos)) + if (owner.hates.contains(s)) + return; + } if (inhibited.contains(pos, owner)) return; if (owner.needs != null) for(Sequence s : owner.needs) @@ -106,14 +119,16 @@ class GSS { 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)) performed.add(pos, owner); + */ } + if (reduction!=null) uninhibit(reduction, parent==null?0:parent.phase().pos); 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 +171,32 @@ class GSS { return true; } - public void uninhibit(int p, Sequence s) { + public void inhibit(int p, Sequence s) { + //if (inhibited.contains(p, s)) return; + if (performed.contains(p, s)) throw new Reset(); + /* if (s.hated!=null) for(Sequence s2 : s.hated) - inhibited.remove(p, s2); + uninhibit(p, s2); + */ + if (s.needed!=null) + for(Sequence s2 : s.needed) + if (performed.contains(p, s2)) + throw new Reset(); + if (performed.contains(p, s)) throw new Reset(); } - 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); - } + public void uninhibit(Position r, int p) { uninhibit(p, r.owner()); } + public void uninhibit(int p, Sequence s) { + if (performed.contains(p, s)) return; + performed.add(p, s); + if (s.hated != null) + for(Sequence seq : s.hated) + inhibit(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 +213,30 @@ class GSS { reducing_list[i] = null; n.performReductions(); } + /* if (expectedInhibit.size() > 0) { + System.out.println("\n!!!!"); + for(int i : expectedInhibit) + for(Sequence es : expectedInhibit.getAll(i)) + System.out.println(" " + i + ": " + es); + System.out.println(""); inhibited.removeAll(expectedInhibit); - System.out.println("\n!!!!\n"); throw new Reset(); } + */ + if (reset) { + reset = false; + 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 +260,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 +271,7 @@ class GSS { } - public class Waiting { + class Waiting { Node parent; Forest pending; State state; @@ -265,7 +294,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 +319,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 +334,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