X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FResult.java;h=efaad4cee2eb04524554d886d3c5b66a45c8863e;hp=9db5aeeb1abbfd7df1d9627195b3f2d5bad93ba3;hb=33d7b8fa4974bad96108c11e5548b354cf10ecb8;hpb=954c6edf9a45f16463c4afc2a2f1abe940c6b184

diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java
index 9db5aee..efaad4c 100644
--- a/src/edu/berkeley/sbp/Result.java
+++ b/src/edu/berkeley/sbp/Result.java
@@ -1,64 +1,62 @@
-// 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.util.*;
-import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
+import edu.berkeley.sbp.Sequence.Pos;
 import java.util.*;
 
 final class Result implements GraphViz.ToGraphViz {
 
     private Forest f;
-    private Node parent;
-    private GSS.Phase phase;
-    private Position reduction;
-    private HashSet<Node> children = new HashSet<Node>();
+    private Node pred;
+    private HashSet<Node> successors = new HashSet<Node>();
     private boolean destroyed = false;
     private int usedByNonDoomedNode = 0;
 
-    public Position reduction() { return reduction; }
-    public GSS.Phase phase() { return phase; }
+    public GSS.Phase phase() { return pred==null ? null : pred.phase(); }
     public Forest getForest() { return f; }
-    public Node parent() { return parent; }
-    public void addChild(Node child) {
-        children.add(child);
-        usedByNonDoomedNode += child.state().doomed ? 0 : 1;
+    public Node pred() { return pred; }
+    public void addSucc(Node succ) {
+        successors.add(succ);
+        usedByNonDoomedNode += succ.state().doomed ? 0 : 1;
     }
-    public void removeChild(Node child) {
-        children.remove(child);
-        usedByNonDoomedNode -= child.state().doomed ? 0 : 1;
+    public void removeSucc(Node succ) {
+        if (!successors.contains(succ)) return;
+        successors.remove(succ);
+        usedByNonDoomedNode -= succ.state().doomed ? 0 : 1;
+        check();
     }
 
-    public boolean usedByAnyNode() { return children.size() > 0; }
+    public boolean usedByAnyNode() { return successors.size() > 0; }
     public boolean usedByNonDoomedNode() { return usedByNonDoomedNode > 0; }
 
-    public String toString() { return super.toString()+"->"+parent(); }
+    public String toString() { return super.toString()+"->"+pred(); }
 
-    public void check() { if (children.size()==0) destroy(); }
+    public void check() { if (successors.size()==0) destroy(); }
     public void destroy() {
         if (destroyed) return;
-        if (parent==null) return;  // never destroy the "primordeal" result
+        if (pred==null) return;  // never destroy the "primordeal" result
         destroyed = true;
-        if (parent() != null) {
-            parent().removeChild(this);
-            parent().check();
-        }
-        OUTER: while(true) {
-            for(Node n : children) {
-                children.remove(n);
+        pred.removeSucc(this);
+        while(successors.size() > 0)
+            for(Node n : successors) {
+                removeSucc(n);
                 n.removeResult(this);
-                n.check();
-                continue OUTER;
+                break;
             }
-            break;
-        }
     }
 
-    public Result(Forest f, Node parent, Position reduction) {
+    public Result(Forest f, Node pred, Pos reduction) {
+        this(f, pred, reduction, null);
+    }
+    public Result(Forest f, Node pred, Pos reduction, GSS.Phase target) {
         this.f = f;
-        this.reduction = reduction;
-        this.parent = parent;
-        if (parent != null) parent.addChild(this);
-        if (parent != null) phase = parent.phase();
+        this.pred = pred;
+        if (pred != null) pred.addSucc(this);
+        if (reduction == null) return;
+        Parser.Table.State state0 = (Parser.Table.State)pred.state().gotoSetNonTerminals.get(reduction);
+        target.newNodeFromReduction(this, state0, reduction);
     }
 
     // GraphViz //////////////////////////////////////////////////////////////////////////////
@@ -68,7 +66,7 @@ final class Result implements GraphViz.ToGraphViz {
         GraphViz.Node n = gv.createNode(this);
         n.label = ""+f;
         n.shape = "rectangle";
-        if (parent()!=null) n.edge(parent, "");
+        if (pred()!=null) n.edge(pred, "");
         n.color = "blue";
         if (phase() != null)
             ((GraphViz.Group)phase().toGraphViz(gv)).add(n);