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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index c2216cc..d2bfc4b 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,58 +1,99 @@
 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.*;
 
 /** a tree (or node in a tree); see jargon.txt for details */
-public class Tree<T> {
+public class Tree<T>
+    extends PrintableTree<Tree<T>>
+    implements Iterable<Tree<T>>,
+               GraphViz.ToGraphViz {
+
+    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; }
+
+    private Tree<T> lifted() { return children[children.length-1]; }
 
-    final T           head;
-          Tree<T>[]   children;
-    final Token.Location    location;
+    /** 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; }
 
-    public T                 head()     { return head; }
-    public int               numChildren() { return children.length; }
-    public Iterable<Tree<T>> children() { return new ArrayIterator(children); }
-    public Tree<T>           child(int i) { return children[i]; }
+    /** 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);
+    }
 
-    public       Token.Location    getLocation() { return location; }
+    /** 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];
+    }
 
-    public Tree(Token.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Token.Location loc, T head, Tree<T>[] children) {
+    /** 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); }
+    Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
         this.location = loc;
         this.head = head;
-        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.lift = lift && children != null && children.length > 0;
+        this.children = ArrayUtil.clone(children, Tree.class);
     }
 
-    /** append Java code to <tt>sb</tt> which evaluates to this instance */
-    public void toJava(StringBuffer sb) {
-        sb.append("new Tree(null, ");
-        sb.append(head==null ? "null" : "\"" + StringUtil.toJavaString(head+"") + "\"");
-        sb.append(", new Tree[] { ");
-        for(int i=0; i<children.length; i++) {
-            if (children[i]==null)   sb.append("null");
-            else                   children[i].toJava(sb);
-            if (i<children.length-1) sb.append(",\n        ");
+
+    // PrintableTree /////////////////////////////////////////////////////////////////////////////
+
+    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();
         }
-        sb.append("})");
+        return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\""));
     }
+    protected String left()   { return "{"; }
+    protected String right()  { return "}"; }
+    protected boolean ignoreSingleton() { return false; }
 
-    public String toString() {
-        StringBuffer ret = new StringBuffer();
-        for(int i=0; i<children.length; i++) {
-            String q = children[i]==null ? "null" : children[i].toString();
-            if (q.length() > 0) { ret.append(q); ret.append(" "); }
-        }
-        String tail = ret.toString().trim();
-        String h = (head!=null && !head.toString().equals("")) ? (tail.length() > 0 ? head+":" : head+"") : "";
-        if (tail.length() > 0) tail = "{" + tail + "}";
-        return h + tail;
+
+    // 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> { }
+    
 }