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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index c2216cc..e7f2ef7 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -7,16 +7,17 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** a tree (or node in a tree); see jargon.txt for details */
-public class Tree<T> {
+public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>> {
 
     final T           head;
           Tree<T>[]   children;
     final Token.Location    location;
 
-    public T                 head()     { return head; }
+    public T                 head()        { return head; }
     public int               numChildren() { return children.length; }
-    public Iterable<Tree<T>> children() { return new ArrayIterator(children); }
-    public Tree<T>           child(int i) { return children[i]; }
+    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       Token.Location    getLocation() { return location; }
 
@@ -29,30 +30,6 @@ public class Tree<T> {
         this.children = children2;
     }
 
-    /** append Java code to <tt>sb</tt> which evaluates to this instance */
-    public void toJava(StringBuffer sb) {
-        sb.append("new Tree(null, ");
-        sb.append(head==null ? "null" : "\"" + StringUtil.toJavaString(head+"") + "\"");
-        sb.append(", new Tree[] { ");
-        for(int i=0; i<children.length; i++) {
-            if (children[i]==null)   sb.append("null");
-            else                   children[i].toJava(sb);
-            if (i<children.length-1) sb.append(",\n        ");
-        }
-        sb.append("})");
-    }
-
-    public String toString() {
-        StringBuffer ret = new StringBuffer();
-        for(int i=0; i<children.length; i++) {
-            String q = children[i]==null ? "null" : children[i].toString();
-            if (q.length() > 0) { ret.append(q); ret.append(" "); }
-        }
-        String tail = ret.toString().trim();
-        String h = (head!=null && !head.toString().equals("")) ? (tail.length() > 0 ? head+":" : head+"") : "";
-        if (tail.length() > 0) tail = "{" + tail + "}";
-        return h + tail;
-    }
-
-
+    protected String headToString() { return head==null?null:head.toString(); }
+    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
 }