X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=38fcd32c8d2808afacd912a5b13f3b2c6d2ab924;hb=7ae0f5a59e73016bac97ee23da9f0b10bce6fa12;hp=bffc35303e14658eeb4a83e7762b9576ce87d853;hpb=80a840adb5df31ba5edd20ecac23086ad09a5ca1;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index bffc353..38fcd32 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -42,7 +42,15 @@ public class Tree<T>
     }
 
     protected String headToString() { return head==null?null:head.toString(); }
-    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
+    protected String headToJava()   {
+        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; }
@@ -61,8 +69,11 @@ public class Tree<T>
     public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> {
     }
 
-    public static class ArrayBuildingTreeFunctor<T> implements TreeFunctor<T,T[]> {
+    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) {