X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=220d1ddc0574977bf5a160c41e090328f8cc9f4f;hb=fa858dc4acddd3e32126ff2558e0860315a84758;hp=6b295a5b18b7b66f4b1b9367cc21b1951f60c979;hpb=136bae5cb17061a7d1142450a67ee11a40ba7ef9;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 6b295a5..220d1dd 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -11,32 +11,36 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
 
     final T           head;
           Tree<T>[]   children;
-    final Token.Location    location;
+          Object[]    labels;
+    final Input.Location    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       Token.Location    getLocation() { return location; }
+    public Input.Location    getLocation() { return location; }
 
-    public Tree(Token.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Token.Location loc, T head, Tree<T>[] children) {
+    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) {
         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;
-    }
 
-    /** since Tree instances are immutable, we can cache this to make pretty-printing MUCH faster */
-    public String toString() {
-        if (toString!=null) return toString;
-        return toString = super.toString();
+        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;
     }
-    private String toString = null;
 
     protected String headToString() { return head==null?null:head.toString(); }
     protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
+    protected String left()   { return "{"; }
+    protected String right()  { return "}"; }
+    protected boolean ignoreSingleton() { return false; }
 }