X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=3df0c21855619dde2193de88700e70b61fa8fb9b;hb=b205c5ee125119b0372328b70e8a66164df18fd0;hp=65af62e11b571d9ca04dbbad06e41c9ef3ebe7cd;hpb=d22fc3c103cc371f742b2ed0e931e42388255560;p=sbp.git

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 65af62e..3df0c21 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -146,13 +146,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;
@@ -271,24 +272,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 */
@@ -296,14 +280,15 @@ 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) {
+            public Iterable<Forest.Ref> results() { return resultMap; }
+            public FastSet<Node> parents() { return set; }
+            public boolean merge(Node parent, Forest result) {
                 for(Forest.Ref f : results()) {
-                    if (f.parents.contains(parent) && f.parents.size()==1) {
+                    if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
                         f.merge(result);
-                        return;
+                        return true;
                     }
                 }
                 Forest.Ref f = new Forest.Ref();
@@ -311,27 +296,8 @@ class GSS {
                 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;
@@ -346,7 +312,6 @@ 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;
@@ -365,19 +330,15 @@ class GSS {
             }
 
             public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) {
+                holder = r.holder;
                 Forest old = holder[pos];
 
-                // 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;
                         holder[pos] = result;
                         if (pos==0) {
-                            System.arraycopy(holder, 0, r.holder, 0, holder.length);
+                            //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");
                             child.finish(r, r.rewrite(phase().getLocation()), target, holder);
                         } else {
@@ -405,6 +366,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;