X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FNode.java;h=ccc2516d3d6011c04525d55b3260f9468c138a9a;hp=b734a8f08a95516034cf5d6e4b9ffa99b78d7ea8;hb=33d7b8fa4974bad96108c11e5548b354cf10ecb8;hpb=9d727bd14c659cdc6c34153b988e8d3fdb8067f5

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index b734a8f..ccc2516 100644
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -1,17 +1,18 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
 
 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.Sequence.Pos;
+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> {
@@ -28,31 +29,31 @@ final class Node
     public void check() {
         if (destroyed) return;
         boolean dead = true;
-        // - all nodes must have a parent
+        // - all nodes must have a predecessor
         // - non-doomed nodes must either:
         //      - 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 : successors)
+                 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) {
-                children.remove(r);
+        while(successors.size()>0)
+            for(Result r : successors) {
+                successors.remove(r);
                 r.destroy();
                 break;
             }
         while(results.size()>0)
             for(Result r : results) {
                 results.remove(r);
-                r.removeChild(this);
+                r.removeSucc(this);
                 break;
             }
         results = null;
-        children = null;
+        successors = null;
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -65,25 +66,31 @@ final class Node
     private final boolean fromEmptyReduction;
     //private       FastSet<Result> results = new FastSet<Result>();
     private       HashSet<Result> results = new HashSet<Result>();
-    private       HashSet<Result> children = new HashSet<Result>();
+    private       HashSet<Result> successors = 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), 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
         for(Result res : results)
             if (only == null || res == only) {
-                Node child = res.parent();
+                Node pred = res.pred();
                 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);
+                if (pos>0)  pred.reduce(r, pos-1, target, null);
+                else {
+                    Input.Region region = pred.phase().getLocation().createRegion(target.getLocation());
+                    new Reduction(pred, r, r.rewrite(region), target);
+                }
             }
         holder[pos] = old;
     }
@@ -98,11 +105,11 @@ final class Node
         state.invokeEpsilonReductions(phase().token, this);
     }
 
-    // Add/Remove Children/Results //////////////////////////////////////////////////////////////////////////////
+    // Add/Remove Successors/Results //////////////////////////////////////////////////////////////////////////////
 
-    public void removeChild(Result child)   {
-        if (children==null) return;
-        children.remove(child);
+    public void removeSucc(Result succ)   {
+        if (successors==null) return;
+        successors.remove(succ);
         check();
     }
     public void removeResult(Result result) {
@@ -110,14 +117,14 @@ final class Node
         results.remove(result);
         check();
     }
-    public void addChild(Result child)      {
-        if (children==null) return;   // FIXME: this should not happen
-        children.add(child);
+    public void addSucc(Result succ)      {
+        if (successors==null) return;   // FIXME: this should not happen
+        successors.add(succ);
     }
     public void addResult(Result r) {
         if (results.contains(r)) return;
         results.add(r);
-        r.addChild(this);
+        r.addSucc(this);
         if (!fromEmptyReduction) state.invokeReductions(phase().getToken(), this, r);
     }
 
@@ -127,9 +134,9 @@ 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;
+        boolean haspreds = false;
         for(Result r : results) n.edge(r, "");
         n.color = state.doomed ? "red" : "green";
         ((GraphViz.Group)phase().toGraphViz(gv)).add(n);