X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=80fbd5c4655f28e7e0e2aad060b02975fe09ddca;hp=2154731274229e22643d1775550864f295eab26a;hb=e5cfb136bf7fd1352eff1bd87a458aa4ff748537;hpb=474037fe8463b96dfaf0209be157cbf5223a0910 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 2154731..80fbd5c 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -11,23 +11,25 @@ import java.lang.reflect.*; 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 */ - class Phase implements Invokable.Node>, IntegerMappable { + class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable { + public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { good |= next.newNode(n, result, st, false); } @@ -56,17 +58,18 @@ class GSS { this.pos = previous==null ? 0 : previous.pos+1; this.token = token; this.location = location; - inhibited.clear(); + performed.clear(); 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; @@ -101,21 +104,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) uninhibit(reduction, parent==null?0:parent.phase().pos); if (reduction != null) { boolean redo = true; while(redo) { @@ -132,8 +149,8 @@ class GSS { } } private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { - p.holder.merge(pending); - if (p.parents().contains(parent)) return true; + //if (p.parents().contains(parent)) return true; + p.merge(parent, pending); p.parents().add(parent, true); if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; @@ -158,34 +175,8 @@ class GSS { return true; } - public void inhibit(int p, Sequence s) { - if (s.hated!=null) - for(Sequence s2 : s.hated) - inhibited.remove(p, s2); - } - - public void uninhibit(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)) { - inhibit(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() throws ParseFailed{ + public void reduce() throws ParseFailed { try { reducing = true; if (reducing_list==null || reducing_list.length < hash.size()) @@ -202,11 +193,18 @@ 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(); @@ -220,7 +218,7 @@ class GSS { /** 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) { + if (prev!=null && parser.helpgc) { prev.hash = null; prev.singularReductions = null; } @@ -231,7 +229,8 @@ class GSS { for(Phase.Node n : hash.values()) { if (token == null && n.state.isAccepting()) { if (finalResult==null) finalResult = new Forest.Ref(); - finalResult.merge(n.holder); + for(Object f : n.results()) + finalResult.merge((Forest)f); } if (token == null) continue; n.state.invokeShifts(token, this, result, n); @@ -272,9 +271,27 @@ class GSS { // Node ///////////////////////////////////////////////////////////////////////////////// /** a node in the GSS */ - final class Node extends FastSet implements Invokable, IntegerMappable { + final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz { + public FastSet set = new FastSet(); + + public GraphViz.Node toGraphViz(GraphViz gv) { + if (gv.hasNode(this)) return gv.createNode(this); + GraphViz.Node n = gv.createNode(this); + n.label = ""+state.toStringx(); + n.shape = "rectangle"; + n.fill = "green"; + //GraphViz.Node f = pending().toGraphViz(gv); + //n.add(f); + for(Forest result : results()) n.edge(result, ""); + for(Node parent : parents()) n.edge(parent, ""); + ((GraphViz.Group)phase().toGraphViz(gv)).add(n); + return n; + } + public boolean isTransparent() { return false; } + public boolean isHidden() { return false; } - private Forest.Ref holder = null; + + //private Forest.Ref holder = new Forest.Ref(); private boolean allqueued = false; /** what state this node is in */ @@ -282,9 +299,28 @@ class GSS { /** 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 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; } + //private Forest pending() { return !Phase.this.closed ? holder : holder.resolve(); } + private HashMap resultMap = new HashMap(); + public void merge(Node parent, Forest result) { + //holder.merge(result); + Forest.Ref f = (Forest.Ref)resultMap.get(parent); + if (f==null) { f = new Forest.Ref(); resultMap.put(parent, f); } + f.merge(result); + set.add(parent, true); + } + //public Iterable childrenFor(Forest result) { return resultMap.getAll(result); } + public Iterable results() { return resultMap.values(); } + private Forest pending(Node n) { + //return !Phase.this.closed ? holder : holder.resolve(); + /* + for(Forest f : resultMap) + if (resultMap.contains(f, n)) + return f; + return null; + */ + return resultMap.get(n); + } + public FastSet parents() { return set; } public void performReductions() { if (allqueued) return; @@ -299,6 +335,7 @@ class GSS { public void performEmptyReductions() { state.invokeReductions(token, this, null, null); } public final void invoke(Position r, Node n, Node n2) { + //if (r.owner().lame) return; if (n==null || n2==null || r.pos==0) { if (r.pos==0) { if (n==null) n = this; @@ -307,38 +344,70 @@ class GSS { 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 n.reduce(r, r.pos-1, n.phase(), holder, null, n.pending(n)); } else { 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); + n.reduce(r, pos, n.phase(), holder, n2, n.pending(n)); } } - 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) { + reduce(r, pos, target, holder, null); } public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { + reduce(r, pos, target, holder, only, this.pending()); + } + */ + public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) { Forest old = holder[pos]; - holder[pos] = this.pending(); + holder[pos] = pending; if (pos==0) { - System.arraycopy(holder, 0, r.holder, 0, holder.length); - for(int i=0; i