factor Pos out of Position in preparation for serialiable parse tables

[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..2cb33a9 100644 (file)
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -5,13 +5,14 @@ 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.Sequence.Pos;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
 /** a node in the GSS */
 final class Node
-    implements Invokable<Position, Result>,
+    implements Invokable<Pos, Result>,
                IntegerMappable,
                GraphViz.ToGraphViz,
                Iterable<Result> {
@@ -33,11 +34,11 @@ final class Node
         //      - be on the frontier or
         //      - have a non-doomed node closer to the frontier than themself
         if (phase.isFrontier()) dead = false;
-        for(Result r : children)
-            if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
-            else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
+        else for(Result r : children)
+                 if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
+                 else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
         dead |= results.size()==0;
-        if (!dead || destroyed) return;
+        if (!dead) return;
         destroyed = true;
         while(children.size()>0)
             for(Result r : children) {
@@ -67,14 +68,17 @@ final class Node
     private       HashSet<Result> results = new HashSet<Result>();
     private       HashSet<Result> children = new HashSet<Result>();
 
-    public final void invoke(Position r, Result only) {
+    public final void invoke(Pos 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 (emptyProductions != (r.numPops()==0)) return;
+        if (r.numPops()!=0)  reduce(r, r.numPops()-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) {
+    private void reduce(Pos r, int pos, GSS.Phase target, Result only) {
         Forest[] holder = r.holder;
         Forest old = holder[pos];
         if (results==null) return;   // FIXME: this should not happen
@@ -83,7 +87,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 +134,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, "");