more refactoring into Node

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

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index b360071..1168c78 100644 (file)
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -1,103 +1,60 @@
-// 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.*;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Parser.Table.*;
-import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
+import edu.berkeley.sbp.Sequence.Pos;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-/** a node in the GSS */
-final class Node
-    implements Invokable<Position, Boolean, Result>,
-               IntegerMappable,
+class Node<OtherNode extends Node>
+    implements IntegerMappable,
                GraphViz.ToGraphViz,
-               Iterable<Result> {
+               Iterable<OtherNode> {
 
-    /** which GSS.Phase this Node belongs to */
-    public  GSS.Phase phase() { return phase; }
-    public Iterator<Result> iterator() { return results.iterator(); }
-    public Parser.Table.State state() { return state; }
+    protected       FastSet<OtherNode> predecessors = new FastSet<OtherNode>();
+    protected       FastSet<OtherNode> successors = new FastSet<OtherNode>();
+    //private       HashSet<OtherNode> predecessors = new HashSet<OtherNode>();
+    //private       HashSet<OtherNode> successors = new HashSet<OtherNode>();
 
-    public int toInt() { return idx; }
-
-    public boolean merge(Result r) {
-        if (results.contains(r)) return true;
-        results.add(r);
-        if (fromEmptyReduction) return false;
-        state.invokeReductions(phase().getToken(), this, false, r);
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-
-    private static int node_idx = 0;
-    private final int idx = node_idx++;
-
-    private final GSS.Phase phase;
-    private final Parser.Table.State state;
-    private final boolean fromEmptyReduction;
-    //private       FastSet<Result> results = new FastSet<Result>();
-    private       HashSet<Result> results = new HashSet<Result>();
-
-    public final void invoke(Position r, Boolean emptyProductions, Result only) {
-        if (emptyProductions != (r.pos==0)) return;
-        if (r.pos==0) finish(r, r.zero(phase().getLocation().createRegion(phase().getLocation())), 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];
-        for(Result res : results)
-            if (only == null || res == only) {
-                Node child = res.parent();
-                holder[pos] = res.getForest();
-                if (pos>0)  child.reduce(r, pos-1, target, null);
-                else new Reduction(child, r, r.rewrite(child.phase().getLocation().createRegion(target.getLocation())), target);
-            }
-        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);
-    }
+    public Iterator<OtherNode> iterator() { return predecessors.iterator(); }
 
-    Node(GSS.Phase phase, Result result, State state, boolean fromEmptyReduction) {
-        this.phase = phase;
-        this.state = state;
-        this.fromEmptyReduction = fromEmptyReduction;
-        results.add(result);
-        if (phase.hash.get(state, result.phase()) != null) throw new Error("severe problem!");
-        phase.hash.put(state, result.phase(), this);
-
-        for(Object s : state.also)
-            phase.newNode(new Result(null, this, null), (State)s, fromEmptyReduction);
-
-        state.invokeReductions(phase().token, this, true, null);
-        if (!fromEmptyReduction)
-            state.invokeReductions(phase().getToken(), this, false, null);
+    public boolean noSuccessors() { return successors.size()==0; }
+    public boolean predecessorsContains(OtherNode n) {
+        return predecessors.contains(n);
     }
 
     // GraphViz //////////////////////////////////////////////////////////////////////////////
 
-    public GraphViz.Node toGraphViz(GraphViz gv) {
-        if (results.size()==0) return null;
+    public GraphViz.StateNode toGraphViz(GraphViz gv) {
         if (gv.hasNode(this)) return gv.createNode(this);
-        GraphViz.Node n = gv.createNode(this);
-        n.label = ""+state.toStringx();
+        GraphViz.StateNode n = gv.createNode(this);
+        /*
+        n.label = ""+f;
+        n.shape = "rectangle";
+        //if (pred()!=null) n.edge(pred, "");
+        n.color = "blue";
+        if (phase() != null)
+            ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
+        n.label = "state["+state.toInt()+"]";
         n.shape = "rectangle";
-        boolean hasparents = false;
-        for(Result r : results) n.edge(r, "");
+        boolean haspreds = false;
+        for(ResultNode r : results) n.edge(r, "");
         n.color = state.doomed ? "red" : "green";
         ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
+        */
         return n;
     }
     public boolean isTransparent() { return false; }
     public boolean isHidden() { return false; }
 
-}
+    // IntegerMappable ////////////////////////////////////////////////////////////
+
+    private static int node_idx = 0;
+    private final int idx = node_idx++;
+    public int toInt() { return idx; }
+
+}
\ No newline at end of file