X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=f87c5dc7d6761c054c337fb5e8765a7a04e77c73;hp=d2bfc4bbc46a6bf379bd79633fff7746bb1bc834;hb=2c1c0293545f3d12c23220fd05c663e6aa3f3de1;hpb=d86c2344f6f5b958d56e2aa55e84af2dc76ab487

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index d2bfc4b..f87c5dc 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -6,34 +6,33 @@ import java.io.*;
 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>>,
-               GraphViz.ToGraphViz {
+/** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
+public class Tree<NodeType>
+    extends PrintableTree<Tree<NodeType>>
+    implements Iterable<Tree<NodeType>> {
 
     private final Input.Region location;
-    private final T            head;
-    private final Tree<T>[]    children;
+    private final NodeType     head;
+    private final Tree<NodeType>[]    children;
     private final boolean      lift;
 
     /** the element at the head of the tree */
-    public T                 head()        { return head; }
+    public NodeType                 head()        { return head; }
 
-    private Tree<T> lifted() { return children[children.length-1]; }
+    private Tree<NodeType> lifted() { return children[children.length-1]; }
 
     /** the number of children the tree has */
-    public int               numChildren() {
+    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; }
+    public Iterable<Tree<NodeType>> children()    { return this; }
 
     /** the tree's children */
-    public Iterator<Tree<T>> iterator()    {
+    public Iterator<Tree<NodeType>> iterator()    {
         return lift
             ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
                                       children[children.length-1].iterator())
@@ -41,7 +40,7 @@ public class Tree<T>
     }
 
     /** get the <tt>i</t>th child */
-    public Tree<T> child(int i)  {
+    public Tree<NodeType> child(int i)  {
         return lift && i >= children.length-1
             ? children[children.length-1].child(i-(children.length-1))
             : children[i];
@@ -50,9 +49,11 @@ public class Tree<T>
     /** 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); }
-    Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
+    public Tree(Input.Region loc, NodeType head)                     { this(loc, head, null); }
+    public Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children) { this(loc, head, children, false); }
+
+    /** package-private constructor, allows setting the "lift" bit */
+    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean lift) {
         this.location = loc;
         this.head = head;
         this.lift = lift && children != null && children.length > 0;
@@ -78,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> { }
-    
 }