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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index cdd3b8b..1b9ddfa 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,7 +1,7 @@
 package edu.berkeley.sbp;
 import 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.*;
@@ -12,41 +12,66 @@ public class Tree<T>
     implements Iterable<Tree<T>>,
                GraphViz.ToGraphViz {
 
-    final T           head;
-          Tree<T>[]   children;
-          Object[]    labels;
-    final Input.Location    location;
+    private final Input.Region location;
+    private final T            head;
+    private final Tree<T>[]    children;
+    private final boolean      lift;
 
     public T                 head()        { return head; }
-    public int               numChildren() { return children.length; }
-    public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
-    public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
-    public Tree<T>           child(int i)  { return children[i]; }
-    public Object            label(int i)  { return labels[i]; }
 
-    public Input.Location    getLocation() { return location; }
+    private Tree<T> lifted() { return children[children.length-1]; }
+
+    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);
+    }
+
+    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.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children) { this(loc, head, children, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children, Object[] labels) {
+    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 && children != null && children.length > 0;
+        this.children = ArrayUtil.clone(children, Tree.class);
+    }
 
-        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;
 
-        Object[] labels2 = labels==null ? new Object[0] : new Object[labels.length];
-        if (labels != null) System.arraycopy(labels, 0, labels2, 0, labels.length);
-        this.labels = labels2;
-    }
+    // PrintableTree /////////////////////////////////////////////////////////////////////////////
 
-    protected String headToString() { return head==null?null:head.toString(); }
-    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
+    protected String headToString() { return head()==null?null:head().toString(); }
+    protected String headToJava()   {
+      // FIXME
+        if (head()==null) return null;
+        if (head() instanceof ToJava) {
+            StringBuffer sb = new StringBuffer();
+            ((ToJava)head()).toJava(sb);
+            return sb.toString();
+        }
+        return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\""));
+    }
     protected String left()   { return "{"; }
     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);
@@ -57,4 +82,10 @@ public class Tree<T>
     }
     public boolean isTransparent() { return false; }
     public boolean isHidden() { return false; }
+
+
+    // TreeFunctor /////////////////////////////////////////////////////////////////////////////
+
+    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
+    
 }