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 c54fa6a..8e3020d 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,7 +1,7 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
+import edu.berkeley.sbp.bind.*;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
@@ -60,7 +60,7 @@ public class Tree<T>
     public boolean isTransparent() { return false; }
     public boolean isHidden() { return false; }
 
-    public static interface TreeFunctor<T,R> extends Functor<Tree<T>, R> {
+    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> {
     }
 
     public static class ArrayBuildingTreeFunctor<T> implements TreeFunctor<T,T[]>, ToJava {
@@ -68,11 +68,11 @@ public class Tree<T>
         public void toJava(StringBuffer sb) { sb.append("new Tree.ArrayBuildingTreeFunctor()"); }
         public String toString() { return ""; }
         
-        public T[] invoke(Tree<T> t) {
+        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));
+                    ret.add(((Functor<Iterable<Tree>,Object>)tc.head()).invoke(tc.children()));
                 else if (tc.numChildren() == 0)
                     ret.add(tc.head());
                 else {
@@ -84,4 +84,14 @@ public class Tree<T>
         }
     }
 
+    public static class BindingFunctor<T> implements TreeFunctor<T,Object>/*, ToJava*/ {
+        private Binding _binding;
+        public BindingFunctor(Binding binding) {
+            this._binding = binding;
+        }
+        public Object invoke(Iterable<Tree<T>> t) {
+            return _binding.invoke(new Object[] { t });           
+        }
+    }
+
 }