X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=836867398c03fe3192519d721a2810d4db7d9a02;hb=9b031db4cefc550c82a8bb6da3b061d3790c2cdc;hp=1b9ddfa668f8bcee675892b4c216cc7408456fac;hpb=c8d1c3a25e2bfa9645c4b91d3dde9c4857f636f2;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 1b9ddfa..8368673 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -6,27 +6,32 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-/** a tree (or node in a tree); see jargon.txt for details */
+/** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
 public class Tree<T>
     extends PrintableTree<Tree<T>>
-    implements Iterable<Tree<T>>,
-               GraphViz.ToGraphViz {
+    implements Iterable<Tree<T>> {
 
     private final Input.Region location;
     private final T            head;
     private final Tree<T>[]    children;
     private final boolean      lift;
 
+    /** the element at the head of the tree */
     public T                 head()        { return head; }
 
     private Tree<T> lifted() { return children[children.length-1]; }
 
-    public int               numChildren() {
+    /** the number of children the tree has */
+    public int               size() {
         return lift
-            ? (children.length-1)+lifted().numChildren()
+            ? (children.length-1)+lifted().size()
             : children.length;
     }
+
+    /** the tree's children */
     public Iterable<Tree<T>> children()    { return this; }
+
+    /** the tree's children */
     public Iterator<Tree<T>> iterator()    {
         return lift
             ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
@@ -34,17 +39,21 @@ public class Tree<T>
             : new ArrayIterator(children);
     }
 
+    /** get the <tt>i</t>th child */
     public Tree<T> child(int i)  {
         return lift && i >= children.length-1
             ? children[children.length-1].child(i-(children.length-1))
             : children[i];
     }
 
+    /** get the input region that this tree was parsed from */
     public Input.Region    getRegion() { return location; }
 
     public Tree(Input.Region loc, T head)                     { this(loc, head, null); }
     public Tree(Input.Region loc, T head, Tree<T>[] children) { this(loc, head, children, false); }
-    public Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
+
+    /** package-private constructor, allows setting the "lift" bit */
+    Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
         this.location = loc;
         this.head = head;
         this.lift = lift && children != null && children.length > 0;
@@ -70,22 +79,4 @@ public class Tree<T>
     protected boolean ignoreSingleton() { return false; }
 
 
-    // ToGraphViz /////////////////////////////////////////////////////////////////////////////
-
-    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; }
-
-
-    // TreeFunctor /////////////////////////////////////////////////////////////////////////////
-
-    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
-    
 }