X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=086a9bb36a8bdbd14cdb12aa969538231b525c1b;hp=ca351d337d3fec34777962e5c93b9495c9a89ae6;hb=2bee2b032b0422d212e17082cc4dcbf28cb897ac;hpb=e2df2c799902dadbc9ebe907ab80e099ac3571e6

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index ca351d3..086a9bb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -14,35 +14,37 @@ public class Tree<T>
 
     final T           head;
           Tree<T>[]   children;
-          Object[]    labels;
-    final Input.Location    location;
+    final Input.Region    location;
 
     public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
     public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }
-    public Object            label(int i)  { return labels[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) { this(loc, head, children, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children, Object[] labels) {
+    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;
 
         Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
         if (children != null) System.arraycopy(children, 0, children2, 0, children.length);
         this.children = children2;
-
-        Object[] labels2 = labels==null ? new Object[0] : new Object[labels.length];
-        if (labels != null) System.arraycopy(labels, 0, labels2, 0, labels.length);
-        this.labels = labels2;
     }
 
     protected String headToString() { return head==null?null:head.toString(); }
-    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
+    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())+"\""));
+    }
     protected String left()   { return "{"; }
     protected String right()  { return "}"; }
     protected boolean ignoreSingleton() { return false; }
@@ -81,4 +83,5 @@ public class Tree<T>
             return (T[])ret.toArray(new Object[0]);
         }
     }
+
 }