cleanups, reorg, and commenting

[sbp.git] / src / edu / berkeley / sbp / Node.java

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index b734a8f..b216d3f 100644 (file)
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -70,8 +70,11 @@ final class Node
     public final void invoke(Position r, Result only) {
         boolean emptyProductions = only==null;
         if (emptyProductions != (r.pos==0)) return;
-        if (r.pos==0) new Result(r.zero(phase().getLocation().createRegion(phase().getLocation())), this, r, phase());
-        else          reduce(r, r.pos-1, phase(), only);
+        if (r.pos!=0)  reduce(r, r.pos-1, phase(), only);
+        else {
+            Input.Region region = phase().getLocation().createRegion(phase().getLocation());
+            new Result(r.rewrite(region, phase().parser().cache()), this, r, phase());
+        }
     }
 
     private void reduce(Position r, int pos, GSS.Phase target, Result only) {
@@ -83,7 +86,10 @@ final class Node
                 Node child = res.parent();
                 holder[pos] = res.getForest();
                 if (pos>0)  child.reduce(r, pos-1, target, null);
-                else new Reduction(child, r, r.rewrite(child.phase().getLocation().createRegion(target.getLocation())), target);
+                else {
+                    Input.Region region = child.phase().getLocation().createRegion(target.getLocation());
+                    new Reduction(child, r, r.rewrite(region, phase().parser().cache()), target);
+                }
             }
         holder[pos] = old;
     }
@@ -127,7 +133,7 @@ final class Node
         if (results.size()==0) return null;
         if (gv.hasNode(this)) return gv.createNode(this);
         GraphViz.Node n = gv.createNode(this);
-        n.label = ""+state.toStringx();
+        n.label = "state["+state.toInt()+"]";
         n.shape = "rectangle";
         boolean hasparents = false;
         for(Result r : results) n.edge(r, "");