checkpoint
[sbp.git] / src / edu / berkeley / sbp / GSS.java
index d2b040d..816c086 100644 (file)
@@ -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,24 +10,36 @@ import java.lang.reflect.*;
 /** implements Tomita's Graph Structured Stack */
 class GSS {
 
+    static int count = 0;
+    static int shifts = 0;
+    static int reductions = 0;
+    int resets = 0;
+    int waits = 0;
+    
     public GSS() { }
 
     private Phase.Node[] reducing_list = null;
-    public int resets = 0;
-    public int waits = 0;
 
-    HashMapBag<Integer,Sequence>       inhibited = new HashMapBag<Integer,Sequence>();
-    HashMapBag<Sequence,Phase.Waiting> waiting   = new HashMapBag<Sequence,Phase.Waiting>();
-    HashMapBag<Integer,Sequence>       performed = new HashMapBag<Integer,Sequence>();
+    // FIXME: right now, these are the performance bottleneck
+    HashMapBag<Sequence,Phase.Waiting> waiting         = new HashMapBag<Sequence,Phase.Waiting>();
+    HashMapBag<Integer,Sequence>       performed       = new HashMapBag<Integer,Sequence>();
+    HashMapBag<Integer,Sequence>       lastperformed   = new HashMapBag<Integer,Sequence>();
+    HashMapBag<Integer,Sequence>       expected        = new HashMapBag<Integer,Sequence>();
     
     /** FIXME */
-    public  Forest.Ref finalResult;
+    Forest.Many finalResult;
 
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
-    public class Phase implements Invokable<State, Forest, GSS.Phase.Node>, IntegerMappable {
+    class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
+
+        public Iterator<Phase.Node> iterator() { return hash.iterator(); }
+        public void invoke(State st, Forest result, Node n) {
+            shifts++;
+            good |= next.newNode(n, result, st, false);
+        }
 
         /** the token immediately after this phase */
-        final Token token;
+        final Tok token;
 
         private final int pos;
 
@@ -38,26 +49,30 @@ 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, 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<Phase.Node>();
+            reset = false;
             good = false;
             closed = false;
             reducing = false;
@@ -73,7 +88,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 +102,38 @@ 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);
+            newNode(parent, pending, state, fromEmptyReduction);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
@@ -121,13 +149,14 @@ 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.merge(parent, pending)) return true;
             p.parents().add(parent, true);
-            if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
+            if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent);
             return true;
         }
+
         private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) {
             do {
                 if (token != null && state.canShift(token)) break;
@@ -140,39 +169,16 @@ class GSS {
                 //return;
             } while(false);
 
-            Node n = new Node(parent, pending, state, fromEmptyReduction);  // ALLOC
-            n.queueEmptyReductions();
-            if (!fromEmptyReduction) n.queueReductions(parent);
+            Node n = new Node(parent, pending, state);  // ALLOC
+            if (reducing) {
+                n.performEmptyReductions();
+                if (!fromEmptyReduction) n.performReductions(parent);
+            }
             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<Integer,Sequence>();
-                    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())
@@ -181,45 +187,61 @@ class GSS {
                 int num = hash.size();
                 for(int i=0; i<num; i++) {
                     Node n = reducing_list[i];
-                    n.queueEmptyReductions();
+                    n.performEmptyReductions();
                     // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
                 }
                 for(int i=0; i<num; i++) {
                     Node n = reducing_list[i];
                     reducing_list[i] = null;
-                    n.queueReductions();
+                    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 <tt>next</tt> */
         public void shift(Phase next, Forest result) throws ParseFailed {
             // this massively improves GC performance
-            if (prev!=null) prev.hash = null;
+            if (prev!=null && parser.helpgc) {
+                prev.hash = null;
+            }
             this.next = next;
             closed = true;
             Forest res = null;
             boolean ok = false;
             for(Phase.Node n : hash.values()) {
                 if (token == null && n.state.isAccepting()) {
-                    if (finalResult==null) finalResult = new Forest.Ref();
-                    finalResult.merge(n.holder);
+                    if (finalResult==null) finalResult = new Forest.Many();
+                    for(Object f : n.results())
+                        finalResult.merge((Forest)f);
                 }
                 if (token == null) continue;
                 n.state.invokeShifts(token, this, result, n);
             }
 
             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()),
@@ -227,13 +249,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;
@@ -247,68 +269,139 @@ class GSS {
             }
         }
        
-        // GSS Nodes //////////////////////////////////////////////////////////////////////////////
+        // Node /////////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> implements Invokable<Reduction, Node, Node> {
+        final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
+            public FastSet<Node> set = new FastSet<Node>();
 
-            public boolean touched = false;
-            private Forest.Ref holder = null;
+           
             private boolean allqueued = false;
 
             /** what state this node is in */
-            public final State state;
+            public final Parser.Table<Tok>.State<Tok> 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; }
-
-            public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
-            public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
-            public  FastSet<Node> parents() { return this; }
+            public  Phase phase() { return Phase.this; }
+
+            private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
+            public Iterable<Forest.Many> results() { return resultMap; }
+            public FastSet<Node> parents() { return set; }
+            public boolean merge(Node parent, Forest result) {
+                // FIXME: inefficient!
+                for(Forest.Many f : results()) {
+                    if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
+                        f.merge(result);
+                        return true;
+                    }
+                }
+                Forest.Many f = new Forest.Many();
+                f.parents.add(parent);
+                f.merge(result);
+                resultMap.add(f);
+                set.add(parent, true);
+                return false;
+            }
 
-            public void queueReductions() {
-                if (!reducing) return;
+            public void performReductions() {
                 if (allqueued) return;
                 allqueued = true;
-                int where = parents().size();
                 state.invokeReductions(token, this, this, null);
             }
 
-            public void queueReductions(Node n2) {
-                if (!allqueued) { queueReductions(); return; }
-                state.invokeReductions(token, this, this, n2);
+            public void performReductions(Node n2) {
+                if (!allqueued) performReductions();
+                else            state.invokeReductions(token, this, this, n2);
             }
 
-            public final void invoke(Reduction r, Node n, Node n2) {
-                if (n==null) {
-                    if (r.position.pos==0) r.reduce(this);
-                    return;
+            public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
+            public final void invoke(Position r, Node n, Node n2) {
+                reductions++;
+                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.pos];
+                    if (r.pos==0) n.finish(r, r.zero(), n.phase());
+                    else          n.reduce(r, r.pos-1,  n.phase(), null);
+                } else {
+                    if (r.pos<=0) throw new Error("called wrong form of reduce()");
+                    int pos = r.pos-1;
+                    n.reduce(r, pos, n.phase(), n2);
                 }
-                if (r.position.pos==0) return;
-                if (n2==null) r.reduce(n);
-                else          r.reduce(n, n2);
             }
-            public void queueEmptyReductions() {
-                if (!reducing) return;
-                state.invokeReductions(token, this, null, null);
+
+            public void reduce(Position r, int pos, Phase target, Node only) {
+                Forest[] holder = r.holder;
+                Forest old = holder[pos];
+
+                HashSet<Forest> rr = new HashSet<Forest>();
+                for(Forest result : results()) rr.add(result);
+                for(Forest result : rr)
+                    for(Node child : ((Forest.Many<?>)result).parents) {
+                        if (only != null && child!=only) continue;
+                        holder[pos] = result;
+                        if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(phase().getLocation())), target);
+                        else        child.reduce(r, pos-1, target, null);
+                    }
+
+                holder[pos] = old;
+            }
+
+            public void finish(Position r, Forest result, Phase<Tok> target) {
+                Parser.Table<Tok>.State<Tok> 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 boolean fe;
-            public boolean dead = false;
-            public boolean redo = false;
-            private Node(Node parent, Forest pending, State state, boolean fe) {
-                this.fe = fe;
+            private Node(Node parent, Forest pending, State state) {
                 this.state = state;
-                this.holder().merge(pending);
+                this.merge(parent, pending);
                 Phase start = parent==null ? null : parent.phase();
                 if (parent != null) parents().add(parent, true);
                 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++;
+
+            // GraphViz //////////////////////////////////////////////////////////////////////////////
+
+            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";
+                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 int node_idx = 0;
 
         public int toInt() { return pos+1; }
         public int size() { return hash==null ? 0 : hash.size(); }
-    }
 
+        // GraphViz //////////////////////////////////////////////////////////////////////////////
+
+        public GraphViz.Node toGraphViz(GraphViz gv) {
+            if (gv.hasNode(this)) return gv.createNode(this);
+            GraphViz.Group g = gv.createGroup(this);
+            g.label = "Phase " + pos;
+            g.color = "gray";
+            g.cluster = true;
+            return g;
+        }
+        public boolean isTransparent() { return false; }
+        public boolean isHidden() { return false; }
+
+    }
 }