rename Result->ResultNode

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

diff --git a/src/edu/berkeley/sbp/StateNode.java b/src/edu/berkeley/sbp/StateNode.java
index 8fb1fd7..321334d 100644 (file)
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -12,14 +12,14 @@ import java.lang.reflect.*;
 
 /** a node in the GSS */
 final class StateNode
-    implements Invokable<Pos, Result, Object>,
+    implements Invokable<Pos, ResultNode, Object>,
                IntegerMappable,
                GraphViz.ToGraphViz,
-               Iterable<Result> {
+               Iterable<ResultNode> {
 
     /** which GSS.Phase this StateNode belongs to */
     public GSS.Phase phase() { return phase; }
-    public Iterator<Result> iterator() { return results.iterator(); }
+    public Iterator<ResultNode> iterator() { return results.iterator(); }
     public Parser.Table.State state() { return state; }
 
     public int toInt() { return idx; }
@@ -34,7 +34,7 @@ final class StateNode
         //      - be on the frontier or
         //      - have a non-doomed node closer to the frontier than themself
         if (phase.isFrontier()) dead = false;
-        else for(Result r : successors)
+        else for(ResultNode r : successors)
                  if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
                  else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
         dead |= results.size()==0;
@@ -43,13 +43,13 @@ final class StateNode
         if (phase() != null && phase().hash != null)
             phase().hash.remove(state, predPhase);
         while(successors.size()>0)
-            for(Result r : successors) {
+            for(ResultNode r : successors) {
                 successors.remove(r);
                 r.removePred(this);
                 break;
             }
         while(results.size()>0)
-            for(Result r : results) {
+            for(ResultNode r : results) {
                 results.remove(r);
                 r.removeSucc(this);
                 break;
@@ -67,12 +67,12 @@ final class StateNode
     private final GSS.Phase predPhase;
     private final Parser.Table.State state;
     private  boolean fromEmptyReduction;
-    private       FastSet<Result> results = new FastSet<Result>();
-    private       FastSet<Result> successors = new FastSet<Result>();
-    //private       HashSet<Result> results = new HashSet<Result>();
-    //private       HashSet<Result> successors = new HashSet<Result>();
+    private       FastSet<ResultNode> results = new FastSet<ResultNode>();
+    private       FastSet<ResultNode> successors = new FastSet<ResultNode>();
+    //private       HashSet<ResultNode> results = new HashSet<ResultNode>();
+    //private       HashSet<ResultNode> successors = new HashSet<ResultNode>();
 
-    public final void invoke(Pos r, Result only, Object o) {
+    public final void invoke(Pos r, ResultNode only, Object o) {
         boolean emptyProductions = only==null;
         if (emptyProductions != (r.numPops()==0)) return;
         if (r.numPops()!=0)  reduce(r, r.numPops()-1, phase(), only);
@@ -82,8 +82,8 @@ final class StateNode
         }
     }
 
-    private void reduce(Pos r, int pos, GSS.Phase target, Result only) {
-        for(Result res : results)
+    private void reduce(Pos r, int pos, GSS.Phase target, ResultNode only) {
+        for(ResultNode res : results)
             if (only == null || res == only)
                 for(StateNode pred : res.getPreds())
                     reduce2(r, pos, target, pred, res.getForest());
@@ -102,9 +102,9 @@ final class StateNode
     }
 
     StateNode(GSS.Phase phase, Forest f, Pos reduction, StateNode pred, State state, boolean fromEmptyReduction) {
-        this(phase, new Result(f, reduction, pred), state, fromEmptyReduction);
+        this(phase, new ResultNode(f, reduction, pred), state, fromEmptyReduction);
     }
-    StateNode(GSS.Phase phase, Result pred, State state, boolean fromEmptyReduction) {
+    StateNode(GSS.Phase phase, ResultNode pred, State state, boolean fromEmptyReduction) {
         this.phase = phase;
         this.state = state;
         this.fromEmptyReduction = fromEmptyReduction;
@@ -122,24 +122,24 @@ final class StateNode
 
     // Add/Remove Successors/Results //////////////////////////////////////////////////////////////////////////////
 
-    public void removeSucc(Result succ)   {
+    public void removeSucc(ResultNode succ)   {
         successors.remove(succ);
         check();
     }
-    public void removeResult(Result result) {
+    public void removeResult(ResultNode result) {
         results.remove(result);
         check();
     }
-    public void addSucc(Result succ)      {
+    public void addSucc(ResultNode succ)      {
         successors.add(succ);
     }
     public void addResult(Forest f, Pos reduction, StateNode pred) {
-        for(Result r : results)
+        for(ResultNode r : results)
             if (r.predecessorsContains(pred)) {
                 r.merge(f);
                 return;
             }
-        Result result = new Result(f, reduction, pred);
+        ResultNode result = new ResultNode(f, reduction, pred);
         results.add(result);
         result.addSucc(this);
         if (!this.fromEmptyReduction) state.invokeReductions(phase().getToken(), this, result);
@@ -154,7 +154,7 @@ final class StateNode
         n.label = "state["+state.toInt()+"]";
         n.shape = "rectangle";
         boolean haspreds = false;
-        for(Result r : results) n.edge(r, "");
+        for(ResultNode r : results) n.edge(r, "");
         n.color = state.doomed ? "red" : "green";
         ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
         return n;