X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=102817cc073505b48a370061fa333611d8e9e277;hb=a7b84506c2e1ed63343db215f76afced082e2826;hp=e7f2ef785a4630775df9b860b0ceafbf5a962d19;hpb=b0d313eb49712b23f9c71003c96f130f23a63526;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index e7f2ef7..102817c 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -11,7 +11,7 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
 
     final T           head;
           Tree<T>[]   children;
-    final Token.Location    location;
+    final Input.Location    location;
 
     public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
@@ -19,10 +19,10 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[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.location = loc;
         this.head = head;
         Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
@@ -30,6 +30,13 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
         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();
+    }
+    private String toString = null;
+
     protected String headToString() { return head==null?null:head.toString(); }
     protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
 }