checkpoint

darcs-hash:20060122103124-5007d-11108077887448acb4f7923371e199f6bdb3e61f.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 475b300..a8c44f0 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -83,10 +83,10 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }
-                    public void child(Tree<T> t) { toks.add(t); }
+                    public void addTree(Tree<T> t) { toks.add(t); }
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.child(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
                     }
@@ -127,16 +127,16 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }
         public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));; }
         public void start(T head, Input.Location loc) { }
-        public void child(Tree<T> t) { toks.add(t); }
+        public void addTree(Tree<T> t) { toks.add(t); }
     }
-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>, TreeConsumer<T> {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
         private boolean toss;
         protected T head;
         public TreeMaker(boolean toss) { this.toss = toss; }
         public abstract void start(T head, Input.Location loc);
         public abstract void finish(T head, Input.Location loc);
-        public abstract void child(Tree<T> t);
+        public abstract void addTree(Tree<T> t);
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;