checkpoint

darcs-hash:20060122102517-5007d-9247b052b123a5250991cd6c3374c60ee744499a.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index d7716dd..420d655 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -39,7 +39,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // Body //////////////////////////////////////////////////////////////////////////////
 
     protected static interface Body<T> {
-        TreeMaker<T> expand(int i, TreeMaker<T> h);
+        void expand(int i, TreeMaker<T> h);
     }
 
     protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
@@ -64,10 +64,10 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.singleton = singleton;
         }
 
-        public TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
+        public void expand(final int i, final TreeMaker<T> h) {
             if (singleton) {
                 tokens[0].visit(h, null, i);
-                return h;
+                return;
             }
             if (i==0) h.start(tag, location);
 
@@ -90,7 +90,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
                     }
                 }, null, null);
             }
-            return h;
         }
 
         protected String  headToString()         { return null; }