checkpoint
[sbp.git] / src / edu / berkeley / sbp / GSS.java
index bde44df..816c086 100644 (file)
@@ -10,27 +10,31 @@ import java.lang.reflect.*;
 /** implements Tomita's Graph Structured Stack */
 class GSS {
 
-    public static int count = 0;
+    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;
 
+    // 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 */
     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);
         }
 
@@ -41,7 +45,6 @@ class GSS {
 
         boolean reducing;
         private IntPairMap<Phase.Node> hash;  /* ALLOC */
-        private IntPairMap<Forest> singularReductions;  /* ALLOC */
         private boolean closed;
         private boolean good;
         private Phase next = null;
@@ -69,7 +72,6 @@ class GSS {
             lastperformed.addAll(performed);
             performed.clear();
             hash = new IntPairMap<Phase.Node>();
-            singularReductions = new IntPairMap<Forest>();
             reset = false;
             good = false;
             closed = false;
@@ -131,8 +133,7 @@ class GSS {
                             }
                 }
             }
-            if (!owner.lame)
-                newNode(parent, pending, state, fromEmptyReduction);
+            newNode(parent, pending, state, fromEmptyReduction);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
@@ -148,13 +149,14 @@ class GSS {
                 }
             }
         }
+
         private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) {
-            //if (p.parents().contains(parent)) return true;
-            p.merge(parent, pending);
+            if (p.merge(parent, pending)) return true;
             p.parents().add(parent, true);
             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;
@@ -220,7 +222,6 @@ class GSS {
             // this massively improves GC performance
             if (prev!=null && parser.helpgc) {
                 prev.hash = null;
-                prev.singularReductions = null;
             }
             this.next = next;
             closed = true;
@@ -228,7 +229,7 @@ class GSS {
             boolean ok = false;
             for(Phase.Node n : hash.values()) {
                 if (token == null && n.state.isAccepting()) {
-                    if (finalResult==null) finalResult = new Forest.Ref();
+                    if (finalResult==null) finalResult = new Forest.Many();
                     for(Object f : n.results())
                         finalResult.merge((Forest)f);
                 }
@@ -274,24 +275,7 @@ class GSS {
         final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
             public FastSet<Node> set = new FastSet<Node>();
 
-        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 = new Forest.Ref();
+           
             private boolean allqueued = false;
 
             /** what state this node is in */
@@ -299,42 +283,25 @@ 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; }
-            //private HashMap<Node,Forest> resultMap = new HashMap<Node,Forest>();
 
-            private HashSet<Forest.Ref> resultMap = new HashSet<Forest.Ref>();
-            public void merge(Node parent, Forest result) {
-                for(Forest.Ref f : results()) {
-                    if (f.parents.contains(parent) && f.parents.size()==1) {
+            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;
+                        return true;
                     }
                 }
-                Forest.Ref f = new Forest.Ref();
+                Forest.Many f = new Forest.Many();
                 f.parents.add(parent);
                 f.merge(result);
                 resultMap.add(f);
                 set.add(parent, true);
-                /*
-                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<Forest.Ref> results() { return resultMap; }
-            //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);
+                return false;
             }
-            */
-            public  FastSet<Node> parents() { return set; }
 
             public void performReductions() {
                 if (allqueued) return;
@@ -349,7 +316,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;
+                reductions++;
                 if (n==null || n2==null || r.pos==0) {
                     if (r.pos==0) {
                         if (n==null) n = this;
@@ -357,59 +324,33 @@ 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, null, null);
+                    if (r.pos==0) n.finish(r, r.zero(), n.phase());
+                    else          n.reduce(r, r.pos-1,  n.phase(), null);
                 } 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, null);
+                    n.reduce(r, pos, n.phase(), 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) {
-                reduce(r, pos, target, holder, only, this.pending());
-            }
-            */
-            public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) {
+            public void reduce(Position r, int pos, Phase target, Node only) {
+                Forest[] holder = r.holder;
                 Forest old = holder[pos];
-                holder[pos] = pending;
-                if (pos==0) {
-
-                    // FIXME: I'm unsure about this -- basically we want to deal with the case where
-                    //        there are two nodes, each of whose Ref points to the same Forest instance.
-                    //        Some node in the next phase has both of these as parents.  This might happen
-                    //        since the same reduction can appear in more than one state.
-
-                    for(Forest result : results())
-                        for(Node child : ((Forest.Ref<?>)result).parents) {
-                            if (only != null && child!=only) continue;
-                            pending = holder[pos] = result;
-                            System.arraycopy(holder, 0, r.holder, 0, holder.length);
-                            for(int i=0; i<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
-                            Forest rex = null;
-                            if (r.pos==1)  rex = singularReductions.get(pending, r);
-                            if (rex==null) {
-                                rex = r.rewrite(phase().getLocation());
-                                if (r.pos==1) singularReductions.put(pending, r, rex);
-                            }
-                            child.finish(r, rex, target, holder);
-                        }
-                } else {
-                    for(Forest result : results())
-                        for(Node child : ((Forest.Ref<?>)result).parents) {
-                            if (only!=null && child!=only) continue;
-                            holder[pos] = result;
-                            child.reduce(r, pos-1, target, holder, null, null);
-                        }
-                }
+
+                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, Forest[] holder) {
+            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)
@@ -426,6 +367,23 @@ class GSS {
             }
             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;