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 c525ffa..e9c9a45 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -105,14 +105,22 @@ public class Tree<T>
 
     public static class RawBindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
         private Binding _binding;
+        private String _toString;
+        public RawBindingFunctor(String toString, Binding binding) {
+            this._binding = binding;
+            this._toString = toString;
+        }
+        public String toString() {
+            return _toString;
+        }
         public void toJava(StringBuffer sb) {
             sb.append("new Tree.RawBindingFunctor(");
+            sb.append("\"");
+            sb.append(StringUtil.toJavaString(_toString));
+            sb.append("\", ");
             _binding.toJava(sb);
             sb.append(")");
         }
-        public RawBindingFunctor(Binding binding) {
-            this._binding = binding;
-        }
         public Object invoke(Iterable<Tree<T>> t) {
             return _binding.invoke(new Object[] { t });           
         }
@@ -120,11 +128,19 @@ public class Tree<T>
 
     public static class BindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
         private Binding _binding;
-        public BindingFunctor(Binding binding) {
+        private String _toString;
+        public String toString() {
+            return _toString;
+        }
+        public BindingFunctor(String toString, Binding binding) {
             this._binding = binding;
+            this._toString = toString;
         }
         public void toJava(StringBuffer sb) {
             sb.append("new Tree.BindingFunctor(");
+            sb.append("\"");
+            sb.append(StringUtil.toJavaString(_toString));
+            sb.append("\", ");
             _binding.toJava(sb);
             sb.append(")");
         }