X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=cdd3b8bee479a4dc71843a7e6d98af4b94953d70;hb=03f91bd299c8c8724fe966f527b7410d2cea675d;hp=2ab70c89de063194fdbbb9d3c81b47d8cf6ee511;hpb=fc1e5069ec5401c425dd29b77b04285916b62d10;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 2ab70c8..cdd3b8b 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -7,10 +7,14 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** a tree (or node in a tree); see jargon.txt for details */
-public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>> {
+public class Tree<T>
+    extends PrintableTree<Tree<T>>
+    implements Iterable<Tree<T>>,
+               GraphViz.ToGraphViz {
 
     final T           head;
           Tree<T>[]   children;
+          Object[]    labels;
     final Input.Location    location;
 
     public T                 head()        { return head; }
@@ -18,28 +22,39 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
     public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }
+    public Object            label(int i)  { return labels[i]; }
 
-    public       Input.Location    getLocation() { return location; }
+    public Input.Location    getLocation() { return location; }
 
     public Tree(Input.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children) {
+    public Tree(Input.Location loc, T head, Tree<T>[] children) { this(loc, head, children, null); }
+    public Tree(Input.Location loc, T head, Tree<T>[] children, Object[] labels) {
         this.location = loc;
         this.head = head;
+
         Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
         if (children != null) System.arraycopy(children, 0, children2, 0, children.length);
         this.children = children2;
-    }
 
-    /** since Tree instances are immutable, we can cache this to make pretty-printing MUCH faster */
-    public String toString() {
-        if (toString!=null) return toString;
-        return toString = super.toString();
+        Object[] labels2 = labels==null ? new Object[0] : new Object[labels.length];
+        if (labels != null) System.arraycopy(labels, 0, labels2, 0, labels.length);
+        this.labels = labels2;
     }
-    private String toString = null;
 
     protected String headToString() { return head==null?null:head.toString(); }
     protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
     protected String left()   { return "{"; }
     protected String right()  { return "}"; }
     protected boolean ignoreSingleton() { return false; }
+
+    public GraphViz.Node toGraphViz(GraphViz gv) {
+        if (gv.hasNode(this)) return gv.createNode(this);
+        GraphViz.Node n = gv.createNode(this);
+        n.label = head()==null ? "" : head().toString();
+        //n.color = "red";
+        for(Tree t : this) n.edge(t, null);
+        return n;
+    }
+    public boolean isTransparent() { return false; }
+    public boolean isHidden() { return false; }
 }