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

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index 1d5e05a..b734a8f 100644
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -11,41 +11,33 @@ import java.lang.reflect.*;
 
 /** a node in the GSS */
 final class Node
-    implements Invokable<Position, Boolean, Result>,
+    implements Invokable<Position, Result>,
                IntegerMappable,
                GraphViz.ToGraphViz,
                Iterable<Result> {
 
     /** which GSS.Phase this Node belongs to */
-    public  GSS.Phase phase() { return phase; }
+    public GSS.Phase phase() { return phase; }
     public Iterator<Result> iterator() { return results.iterator(); }
     public Parser.Table.State state() { return state; }
 
     public int toInt() { return idx; }
 
-    public boolean merge(Result r) {
-        if (results.contains(r)) return true;
-        results.add(r);
-        r.addChild(this);
-        if (fromEmptyReduction) return false;
-        state.invokeReductions(phase().getToken(), this, false, r);
-        return false;
-    }
+    boolean destroyed = false;
 
-    private boolean destroyed = false;
-    public boolean check() {
+    public void check() {
+        if (destroyed) return;
         boolean dead = true;
         // - all nodes must have a parent
         // - 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; }
-            else              { if (r.usedByNonDoomedNode()) dead = false; }
+            if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
+            else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
         dead |= results.size()==0;
-        if (!dead || destroyed) return dead;
+        if (!dead || destroyed) return;
         destroyed = true;
         while(children.size()>0)
             for(Result r : children) {
@@ -57,10 +49,10 @@ final class Node
             for(Result r : results) {
                 results.remove(r);
                 r.removeChild(this);
-                r.check();
                 break;
             }
-        return dead;
+        results = null;
+        children = null;
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -74,19 +66,18 @@ final class Node
     //private       FastSet<Result> results = new FastSet<Result>();
     private       HashSet<Result> results = new HashSet<Result>();
     private       HashSet<Result> children = new HashSet<Result>();
-    public void removeChild(Result child) { children.remove(child); }
-    public void removeResult(Result result) { results.remove(result); }
-    public void addChild(Result child) { children.add(child); }
 
-    public final void invoke(Position r, Boolean emptyProductions, Result only) {
+    public final void invoke(Position r, Result only) {
+        boolean emptyProductions = only==null;
         if (emptyProductions != (r.pos==0)) return;
-        if (r.pos==0) finish(r, r.zero(phase().getLocation().createRegion(phase().getLocation())), phase());
+        if (r.pos==0) new Result(r.zero(phase().getLocation().createRegion(phase().getLocation())), this, r, phase());
         else          reduce(r, r.pos-1, phase(), only);
     }
 
     private void reduce(Position 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();
@@ -97,27 +88,37 @@ final class Node
         holder[pos] = old;
     }
 
-    void finish(Position r, Forest forest, GSS.Phase target) {
-        Parser.Table.State state0 = (Parser.Table.State)state.gotoSetNonTerminals.get(r.owner());
-        Result result = new Result(forest, this, r);
-        target.newNodeFromReduction(result, state0, r.pos<=0, r);
-    }
-
     Node(GSS.Phase phase, Result result, State state, boolean fromEmptyReduction) {
         this.phase = phase;
         this.state = state;
         this.fromEmptyReduction = fromEmptyReduction;
-        results.add(result);
-        result.addChild(this);
         if (phase.hash.get(state, result.phase()) != null) throw new Error("severe problem!");
         phase.hash.put(state, result.phase(), this);
+        addResult(result);
+        state.invokeEpsilonReductions(phase().token, this);
+    }
 
-        for(Object s : state.also)
-            phase.newNode(new Result(null, this, null), (State)s, fromEmptyReduction);
+    // Add/Remove Children/Results //////////////////////////////////////////////////////////////////////////////
 
-        state.invokeReductions(phase().token, this, true, null);
-        if (!fromEmptyReduction)
-            state.invokeReductions(phase().getToken(), this, false, null);
+    public void removeChild(Result child)   {
+        if (children==null) return;
+        children.remove(child);
+        check();
+    }
+    public void removeResult(Result result) {
+        if (results==null) return;
+        results.remove(result);
+        check();
+    }
+    public void addChild(Result child)      {
+        if (children==null) return;   // FIXME: this should not happen
+        children.add(child);
+    }
+    public void addResult(Result r) {
+        if (results.contains(r)) return;
+        results.add(r);
+        r.addChild(this);
+        if (!fromEmptyReduction) state.invokeReductions(phase().getToken(), this, r);
     }
 
     // GraphViz //////////////////////////////////////////////////////////////////////////////