X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=086a9bb36a8bdbd14cdb12aa969538231b525c1b;hp=989224cc8bdb137509a9f7217540c370867b337c;hb=2bee2b032b0422d212e17082cc4dcbf28cb897ac;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 989224c..086a9bb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -7,51 +7,81 @@ 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 {
 
     final T           head;
           Tree<T>[]   children;
-    final Token.Location    location;
+    final Input.Region    location;
 
-    public T                 head()     { return head; }
+    public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
-    public Iterable<Tree<T>> children() { return new ArrayIterator(children); }
+    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       Token.Location    getLocation() { return location; }
+    public Input.Region    getRegion() { return location; }
 
-    public Tree(Token.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Token.Location loc, T head, Tree<T>[] children) {
+    public Tree(Input.Region loc, T head)                   { this(loc, head, null); }
+    public Tree(Input.Region loc, T head, Tree<T>[] children) {
         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;
     }
 
-    /** 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        ");
+    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;
+    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; }
+
+    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]);
+        }
+    }
 
 }