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 86a2ffa..c54fa6a 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -14,7 +14,7 @@ public class Tree<T>
 
     final T           head;
           Tree<T>[]   children;
-    final Input.Location    location;
+    final Input.Region    location;
 
     public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
@@ -22,10 +22,10 @@ public class Tree<T>
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }
 
-    public Input.Location    getLocation() { return location; }
+    public Input.Region    getRegion() { return location; }
 
-    public Tree(Input.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children) {
+    public Tree(Input.Region loc, T head)                   { this(loc, head, null); }
+    public Tree(Input.Region loc, T head, Tree<T>[] children) {
         this.location = loc;
         this.head = head;
 
@@ -36,13 +36,14 @@ public class Tree<T>
 
     protected String headToString() { return head==null?null:head.toString(); }
     protected String headToJava()   {
+      // FIXME
         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())+"\"");
+        return (head==null?"null":("\""+StringUtil.toJavaString(head.toString())+"\""));
     }
     protected String left()   { return "{"; }
     protected String right()  { return "}"; }
@@ -59,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<Iterable<Tree<T>>, R> {
+    public static interface TreeFunctor<T,R> extends Functor<Tree<T>, R> {
     }
 
     public static class ArrayBuildingTreeFunctor<T> implements TreeFunctor<T,T[]>, ToJava {
@@ -67,11 +68,11 @@ public class Tree<T>
         public void toJava(StringBuffer sb) { sb.append("new Tree.ArrayBuildingTreeFunctor()"); }
         public String toString() { return ""; }
         
-        public T[] invoke(Iterable<Tree<T>> t) {
+        public T[] invoke(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.children()));
+                    ret.add(((Functor<Iterable<Tree>,Object>)tc.head()).invoke(tc));
                 else if (tc.numChildren() == 0)
                     ret.add(tc.head());
                 else {