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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 47f5b49..d2bfc4b 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -17,16 +17,22 @@ public class Tree<T>
     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]; }
 
+    /** the number of children the tree has */
     public int               numChildren() {
         return lift
             ? (children.length-1)+lifted().numChildren()
             : 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,24 +40,23 @@ 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) {
+    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;
-
-        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;
+        this.children = ArrayUtil.clone(children, Tree.class);
     }
 
 
@@ -86,65 +91,9 @@ public class Tree<T>
     public boolean isTransparent() { return false; }
     public boolean isHidden() { return false; }
 
-    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
-
-    
-    public static class RawBindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
-        private Binding _binding;
-        private String _toString;
-        public RawBindingFunctor(String toString, Binding binding) {
-            this._binding = binding;
-            this._toString = toString;
-        }
-        public String toString() {
-            return _toString;
-        }
-        public void toJava(StringBuffer sb) {
-            sb.append("new Tree.RawBindingFunctor(");
-            sb.append("\"");
-            sb.append(StringUtil.toJavaString(_toString));
-            sb.append("\", ");
-            _binding.toJava(sb);
-            sb.append(")");
-        }
-        public Object invoke(Iterable<Tree<T>> t) {
-            return _binding.invoke(new Object[] { t });           
-        }
-    }
 
-    public static class BindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
-        private Binding _binding;
-        private String _toString;
-        public String toString() {
-            return _toString;
-        }
-        public BindingFunctor(String toString, Binding binding) {
-            this._binding = binding;
-            this._toString = toString;
-        }
-        public void toJava(StringBuffer sb) {
-            sb.append("new Tree.BindingFunctor(");
-            sb.append("\"");
-            sb.append(StringUtil.toJavaString(_toString));
-            sb.append("\", ");
-            _binding.toJava(sb);
-            sb.append(")");
-        }
-        public Object invoke(Iterable<Tree<T>> t) {
-            ArrayList ret = new ArrayList();
-            for(Tree tc : t) {
-                if (tc.head() != null && tc.head() instanceof Functor)
-                    ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
-                else if (tc.numChildren() == 0)
-                    ret.add(tc.head());
-                else {
-                    System.err.println("FIXME: don't know what to do about " + tc);
-                    ret.add(null);
-                }
-            }
-            Object[] o = (Object[])ret.toArray(new Object[0]);
-            return _binding.invoke(o);
-        }
-    }
+    // TreeFunctor /////////////////////////////////////////////////////////////////////////////
 
+    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
+    
 }