X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FResult.java;h=dfe12bbc6ed7cb48928cec81a46912629607b043;hp=97f467f7b6e35eb9d3067184251c5d8efb53b599;hb=24219bdf084b45273e869cd19382d1640b396566;hpb=8cf79c4b9e5a26ef65bd4af600946b45dbf28a8a

diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java
index 97f467f..dfe12bb 100644
--- a/src/edu/berkeley/sbp/Result.java
+++ b/src/edu/berkeley/sbp/Result.java
@@ -6,23 +6,46 @@ import edu.berkeley.sbp.Sequence.Pos;
 import edu.berkeley.sbp.Sequence.Pos;
 import java.util.*;
 
-final class Result implements GraphViz.ToGraphViz {
+final class Result
+    implements GraphViz.ToGraphViz {
 
-    private Forest f;
-    private Node pred;
-    private HashSet<Node> successors = new HashSet<Node>();
+    private Forest.Many f = new Forest.Many();
+    //private HashSet<StateNode> predecessors = new HashSet<StateNode>();
+    //private HashSet<StateNode> successors = new HashSet<StateNode>();
+    private FastSet<StateNode> predecessors = new FastSet<StateNode>();
+    private FastSet<StateNode> successors = new FastSet<StateNode>();
     private boolean destroyed = false;
+    private boolean primordeal;
     private int usedByNonDoomedNode = 0;
     private Pos reduction;
+    private GSS.Phase predPhase;
 
-    public GSS.Phase phase() { return pred==null ? null : pred.phase(); }
+    public boolean predecessorsContains(StateNode n) {
+        return predecessors.contains(n);
+    }
+    public Pos reduction() { return reduction; }
+    public void merge(Forest newf) {
+        this.f.merge(newf);
+        /*
+        if (predecessors.contains(pred)) return;
+        addPred(pred);
+        if (fromEmptyReduction) return;
+        n.state().invokeReductions(n.phase().getToken(), n, this);        
+        */
+    }
+
+    public boolean noSuccessors() { return successors.size()==0; }
+
+    public GSS.Phase phase() { return predPhase; }
     public Forest getForest() { return f; }
-    public Node pred() { return pred; }
-    public void addSucc(Node succ) {
+    public Iterable<StateNode> getPreds() { return predecessors; }
+    public void addSucc(StateNode succ) {
+        if (successors.contains(succ)) return;
         successors.add(succ);
         usedByNonDoomedNode += succ.state().doomed ? 0 : 1;
+        if (predecessors.size() > 1) throw new Error();
     }
-    public void removeSucc(Node succ) {
+    public void removeSucc(StateNode succ) {
         if (!successors.contains(succ)) return;
         successors.remove(succ);
         usedByNonDoomedNode -= succ.state().doomed ? 0 : 1;
@@ -32,43 +55,64 @@ final class Result implements GraphViz.ToGraphViz {
     public boolean usedByAnyNode() { return successors.size() > 0; }
     public boolean usedByNonDoomedNode() { return usedByNonDoomedNode > 0; }
 
-    public String toString() { return super.toString()+"->"+pred(); }
+    public String toString() { return super.toString()+"->"+predPhase; }
 
-    public void check() { if (successors.size()==0) destroy(); }
+    public void check() {
+        if (successors.size()==0) destroy();
+        else if (predecessors.size()==0) destroy();
+    }
     public void destroy() {
         if (destroyed) return;
-        if (pred==null) return;  // never destroy the "primordeal" result
+        if (primordeal) return;  // never destroy the "primordeal" result
         destroyed = true;
-        pred.removeSucc(this);
+        while(predecessors.size() > 0)
+            for(StateNode pred : predecessors) {
+                removePred(pred);
+                pred.removeSucc(this);
+                break;
+            }
+        predecessors = null;
         while(successors.size() > 0)
-            for(Node n : successors) {
-                removeSucc(n);
-                n.removeResult(this);
+            for(StateNode succ : successors) {
+                removeSucc(succ);
+                succ.removeResult(this);
                 break;
             }
+        successors = null;
     }
 
-    public static void newResult(Forest f, Node pred, Pos reduction, GSS.Phase target) {
-        Result r = new Result(f, pred, reduction);
-        if (reduction == null) return;
-        Parser.Table.State state0 = (Parser.Table.State)pred.state().gotoSetNonTerminals.get(reduction);
-        target.newNodeFromReduction(r, state0, reduction);
+    public void removePred(StateNode pred) {
+        if (!predecessors.contains(pred)) return;
+        predecessors.remove(pred);
+        check();
+    }
+
+    public void addPred(StateNode pred) {
+        if (predPhase==null) predPhase = pred.phase();
+        if (predPhase != pred.phase()) throw new Error();
+        predecessors.add(pred);
+        pred.addSucc(this);
+        if (predecessors.size() > 1) throw new Error();
+    }
+        
+    public Result() {
+        this(null, null, null);
+        this.primordeal = true;
     }
-    public Result(Forest f, Node pred, Pos reduction) {
-        this.f = f;
-        this.pred = pred;
+    public Result(Forest f, Pos reduction, StateNode pred) {
+        this.f.merge(f);
         this.reduction = reduction;
-        if (pred != null) pred.addSucc(this);
+        if (pred != null) addPred(pred);
     }
 
     // GraphViz //////////////////////////////////////////////////////////////////////////////
 
-    public GraphViz.Node toGraphViz(GraphViz gv) {
+    public GraphViz.StateNode toGraphViz(GraphViz gv) {
         if (gv.hasNode(this)) return gv.createNode(this);
-        GraphViz.Node n = gv.createNode(this);
+        GraphViz.StateNode n = gv.createNode(this);
         n.label = ""+f;
         n.shape = "rectangle";
-        if (pred()!=null) n.edge(pred, "");
+        //if (pred()!=null) n.edge(pred, "");
         n.color = "blue";
         if (phase() != null)
             ((GraphViz.Group)phase().toGraphViz(gv)).add(n);