X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=da0c56c355f7844c557cc00d73d8ee61d3259b66;hb=0632bba5da482b2c39e6959e449259bd6725c213;hp=c54fa6ad2a86e49f8e389f10231adf952c04f2a6;hpb=c8a17fdd2e149fe5feecd96c71b7f2cab286ab96;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index c54fa6a..da0c56c 100644
--- 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,46 @@ public class Tree<T>
         }
     }
 
+    public static class RawBindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
+        private Binding _binding;
+        public void toJava(StringBuffer sb) {
+            sb.append("new Tree.RawBindingFunctor(");
+            _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 });           
+        }
+    }
+
+    public static class BindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
+        private Binding _binding;
+        public BindingFunctor(Binding binding) {
+            this._binding = binding;
+        }
+        public void toJava(StringBuffer sb) {
+            sb.append("new Tree.BindingFunctor(");
+            _binding.toJava(sb);
+            sb.append(")");
+        }
+        public Object invoke(Iterable<Tree<T>> t) {
+            ArrayList ret = new ArrayList();
+            for(Tree tc : t) {
+                if (tc.head() != null && tc.head() instanceof Functor)
+                    ret.add(((Tree.TreeFunctor<Object,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);
+                }
+            }
+            Object[] o = (Object[])ret.toArray(new Object[0]);
+            return _binding.invoke(o);
+        }
+    }
+
 }