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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 1b9ddfa..bc450fb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,54 +1,57 @@
+// Copyright 2006 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.bind.*;
 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 boolean      lift;
+    private final Input.Region     location;
+    private final NodeType         ihead;
+    private final Tree<NodeType>[] children;
 
-    public T                 head()        { return head; }
+    /** the number of children the tree has */
+    public int               size() { return children.length; }
 
-    private Tree<T> lifted() { return children[children.length-1]; }
+    /** the element at the head of the tree */
+    public NodeType                 head()        { return ihead; }
+    public NodeType              getHead()        { return ihead; }
 
-    public int               numChildren() {
-        return lift
-            ? (children.length-1)+lifted().numChildren()
-            : children.length;
-    }
-    public Iterable<Tree<T>> children()    { return this; }
-    public Iterator<Tree<T>> iterator()    {
-        return lift
-            ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
-                                      children[children.length-1].iterator())
-            : new ArrayIterator(children);
-    }
+    /** the tree's children */
+    public Iterable<Tree<NodeType>> children()    { return this; }
 
-    public Tree<T> child(int i)  {
-        return lift && i >= children.length-1
-            ? children[children.length-1].child(i-(children.length-1))
-            : children[i];
-    }
+    /** the tree's children */
+    public Iterator<Tree<NodeType>> iterator()    { return new ArrayIterator(children); }
+
+    /** get the <tt>i</t>th child */
+    public Tree<NodeType> child(int i)            { return 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) {
+    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); }
+
+    // FIXME: fairly inefficient because we keep copying arrays
+    /** 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;
-        this.children = ArrayUtil.clone(children, Tree.class);
+        this.ihead = head;
+        if (lift && children != null && children.length > 0) {
+            Tree<NodeType> last = children[children.length-1];
+            this.children = new Tree[(children.length-1)+last.children.length];
+            System.arraycopy(children, 0, this.children, 0, children.length-1);
+            if (last.children.length > 0)
+                System.arraycopy(last.children, 0, this.children, children.length-1, last.children.length);
+        } else {
+            this.children = ArrayUtil.clone(children, Tree.class);
+        }
     }
 
 
@@ -70,22 +73,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> { }
-    
 }