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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 38fcd32..d2bfc4b 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,49 +12,74 @@ 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;
 
+    /** the element at the head of the tree */
     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]; }
+
+    /** 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),
+                                      children[children.length-1].iterator())
+            : 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.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); }
+    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 headToString() { return head()==null?null:head().toString(); }
     protected String headToJava()   {
-        if (head==null) return null;
-        if (head instanceof ToJava) {
+      // FIXME
+        if (head()==null) return null;
+        if (head() instanceof ToJava) {
             StringBuffer sb = new StringBuffer();
-            ((ToJava)head).toJava(sb);
+            ((ToJava)head()).toJava(sb);
             return sb.toString();
         }
-        return head==null?"null":("\""+StringUtil.toJavaString(head.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);
@@ -66,27 +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 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]);
-        }
-    }
+    // TreeFunctor /////////////////////////////////////////////////////////////////////////////
+
+    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
+    
 }