X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FStateNode.java;h=bb461cb3cb4d7d0ed3d5236621e9b4f5924934aa;hp=acd01341c8c5293b0d2e1ed9ad1e5a6fe4a6de2b;hb=76ce41540f06ac1fbcb44332dd62f53e88c27cf1;hpb=053eb99c444844015cfdb486b03c55adb0a3cd7f

diff --git a/src/edu/berkeley/sbp/StateNode.java b/src/edu/berkeley/sbp/StateNode.java
index acd0134..bb461cb 100644
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -12,18 +12,14 @@ import java.lang.reflect.*;
 
 /** a node in the GSS */
 final class StateNode
-    extends Node
-    implements Invokable<Pos, ResultNode, Object>,
-               IntegerMappable,
-               Iterable<ResultNode> {
+    extends Node<ResultNode>
+    implements Invokable<Pos, ResultNode, Object> {
 
     /** which GSS.Phase this StateNode belongs to */
     public GSS.Phase phase() { return phase; }
-    public Iterator<ResultNode> iterator() { return results.iterator(); }
+    public Iterator<ResultNode> iterator() { return predecessors.iterator(); }
     public Parser.Table.State state() { return state; }
 
-    public int toInt() { return idx; }
-
     boolean destroyed = false;
 
     public void check() {
@@ -37,7 +33,7 @@ final class StateNode
         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;
+        dead |= predecessors.size()==0;
         if (!dead) return;
         destroyed = true;
         if (phase() != null && phase().hash != null)
@@ -48,29 +44,22 @@ final class StateNode
                 r.removePred(this);
                 break;
             }
-        while(results.size()>0)
-            for(ResultNode r : results) {
-                results.remove(r);
+        while(predecessors.size()>0)
+            for(ResultNode r : predecessors) {
+                predecessors.remove(r);
                 r.removeSucc(this);
                 break;
             }
-        results = null;
+        predecessors = null;
         successors = null;
     }
 
     //////////////////////////////////////////////////////////////////////
 
-    private static int node_idx = 0;
-    private final int idx = node_idx++;
-
     private final GSS.Phase phase;
     private final GSS.Phase predPhase;
     private final Parser.Table.State state;
     private  boolean fromEmptyReduction;
-    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, ResultNode only, Object o) {
         boolean emptyProductions = only==null;
@@ -83,9 +72,9 @@ final class StateNode
     }
 
     private void reduce(Pos r, int pos, GSS.Phase target, ResultNode only) {
-        for(ResultNode res : results)
+        for(ResultNode res : predecessors)
             if (only == null || res == only)
-                for(StateNode pred : res.getPreds())
+                for(StateNode pred : res)
                     reduce2(r, pos, target, pred, res.getForest());
     }
 
@@ -112,7 +101,7 @@ final class StateNode
         this.predPhase = pred.phase();
         phase.hash.put(state, pred.phase(), this);
 
-        results.add(pred);
+        predecessors.add(pred);
         pred.addSucc(this);
         if (!fromEmptyReduction)
             state.invokeReductions(phase().getToken(), this, pred);
@@ -120,27 +109,27 @@ final class StateNode
         state.invokeEpsilonReductions(phase().token, this);
     }
 
-    // Add/Remove Successors/Results //////////////////////////////////////////////////////////////////////////////
+    // Add/Remove Successors/Predecessors //////////////////////////////////////////////////////////////////////////////
 
     public void removeSucc(ResultNode succ)   {
         successors.remove(succ);
         check();
     }
-    public void removeResult(ResultNode result) {
-        results.remove(result);
+    public void removePred(ResultNode result) {
+        predecessors.remove(result);
         check();
     }
     public void addSucc(ResultNode succ)      {
         successors.add(succ);
     }
-    public void addResult(Forest f, Pos reduction, StateNode pred) {
-        for(ResultNode r : results)
+    public void addPred(Forest f, Pos reduction, StateNode pred) {
+        for(ResultNode r : predecessors)
             if (r.predecessorsContains(pred)) {
                 r.merge(f);
                 return;
             }
         ResultNode result = new ResultNode(f, reduction, pred);
-        results.add(result);
+        predecessors.add(result);
         result.addSucc(this);
         if (!this.fromEmptyReduction) state.invokeReductions(phase().getToken(), this, result);
     }