checkpoint

[sbp.git] / src / edu / berkeley / sbp / Tree.java

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index ca351d3..38fcd32 100644 (file)
--- 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 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; }
     protected String left()   { return "{"; }
     protected String right()  { return "}"; }
     protected boolean ignoreSingleton() { return false; }