X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=2ab70c89de063194fdbbb9d3c81b47d8cf6ee511;hb=aa467fd9d82ee4ab751a6ced1e4f48864f494e90;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..2ab70c8 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];
@@ -39,4 +39,7 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
 
     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; }
 }