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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 102817c..086a9bb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -7,11 +7,14 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** a tree (or node in a tree); see jargon.txt for details */
-public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>> {
+public class Tree<T>
+    extends PrintableTree<Tree<T>>
+    implements Iterable<Tree<T>>,
+               GraphViz.ToGraphViz {
 
     final T           head;
           Tree<T>[]   children;
-    final Input.Location    location;
+    final Input.Region    location;
 
     public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
@@ -19,24 +22,66 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }
 
-    public       Input.Location    getLocation() { return location; }
+    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) {
+    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;
     }
 
-    /** since Tree instances are immutable, we can cache this to make pretty-printing MUCH faster */
-    public String toString() {
-        if (toString!=null) return toString;
-        return toString = super.toString();
+    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; }
+
+    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]);
+        }
     }
-    private String toString = null;
 
-    protected String headToString() { return head==null?null:head.toString(); }
-    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
 }