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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index e9c9a45..47f5b49 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -12,9 +12,9 @@ public class Tree<T>
     implements Iterable<Tree<T>>,
                GraphViz.ToGraphViz {
 
+    private final Input.Region location;
     private final T            head;
     private final Tree<T>[]    children;
-    private final Input.Region location;
     private final boolean      lift;
 
     public T                 head()        { return head; }
@@ -22,37 +22,41 @@ public class Tree<T>
     private Tree<T> lifted() { return children[children.length-1]; }
 
     public int               numChildren() {
-        if (lift && children.length > 0)
-            return (children.length-1)+lifted().numChildren();
-        return children.length;
+        return lift
+            ? (children.length-1)+lifted().numChildren()
+            : children.length;
     }
     public Iterable<Tree<T>> children()    { return this; }
     public Iterator<Tree<T>> iterator()    {
-        if (lift)
-            return new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
-                                           children[children.length-1].iterator());
-        return new ArrayIterator(children);
+        return lift
+            ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
+                                      children[children.length-1].iterator())
+            : new ArrayIterator(children);
     }
-    public Tree<T>           child(int i)  {
-        if (lift && i >= children.length-1)
-            return children[children.length-1].child(i-(children.length-1));
-        return children[i];
+
+    public Tree<T> child(int i)  {
+        return lift && i >= children.length-1
+            ? children[children.length-1].child(i-(children.length-1))
+            : children[i];
     }
 
     public Input.Region    getRegion() { return location; }
 
-    public Tree(Input.Region loc, T head)                   { this(loc, head, null); }
+    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) {
         this.location = loc;
         this.head = head;
-        this.lift = lift;
+        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;
     }
 
+
+    // PrintableTree /////////////////////////////////////////////////////////////////////////////
+
     protected String headToString() { return head()==null?null:head().toString(); }
     protected String headToJava()   {
       // FIXME
@@ -68,6 +72,9 @@ public class Tree<T>
     protected String right()  { return "}"; }
     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);
@@ -79,30 +86,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 ArrayBuildingTreeFunctor<T> implements TreeFunctor<T,T[]>, ToJava {
-
-        public void toJava(StringBuffer sb) { sb.append("new Tree.ArrayBuildingTreeFunctor()"); }
-        public String toString() { return ""; }
-        
-        public T[] invoke(Iterable<Tree<T>> t) {
-            ArrayList ret = new ArrayList();
-            for(Tree tc : t) {
-                if (tc.head() != null && tc.head() instanceof Functor)
-                    ret.add(((Functor<Iterable<Tree>,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);
-                }
-            }
-            return (T[])ret.toArray(new Object[0]);
-        }
-    }
+    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;