checkpoint

[sbp.git] / src / edu / berkeley / sbp / bind / BindingFunctor.java

diff --git a/src/edu/berkeley/sbp/bind/BindingFunctor.java b/src/edu/berkeley/sbp/bind/BindingFunctor.java
index cfe324d..a7d1ecc 100644 (file)
--- a/src/edu/berkeley/sbp/bind/BindingFunctor.java
+++ b/src/edu/berkeley/sbp/bind/BindingFunctor.java
@@ -6,7 +6,7 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-public class BindingFunctor<T> implements Tree.TreeFunctor<T,Object>, ToJava {
+public class BindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
     private Binding _binding;
     private String _toString;
     public String toString() {
@@ -28,8 +28,8 @@ public class BindingFunctor<T> implements Tree.TreeFunctor<T,Object>, ToJava {
         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(((TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
+            else if (tc.size() == 0)
                 ret.add(tc.head());
             else {
                 System.err.println("FIXME: don't know what to do about " + tc);