X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=a8c44f018f7c2eb49faae221e8adefad01364df1;hb=8ac1795e6098dcf10b94a854351162695181b83d;hp=d7716dd7594c7dda1c6df063c73c5931d9fb666a;hpb=c7423816fa31bbf7177a84be372d153f8a3327b5;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index d7716dd..a8c44f0 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -18,15 +18,17 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
-        final HashSet<Tree<T>> hs = new HashSet<Tree<T>>();
-        TreeMaker<T> ret = new TreeMaker<T>(toss) {
-            public void start(T head, Input.Location loc) { }
-            public void finish(T head, Input.Location loc) { hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint))); }
-            public void child(Tree<T> t) { toks.add(t); }
-        };
-        visit(ret, null, null);
-        if (toss && hs.size() > 1) throw new Ambiguous(this);
-        return hs;
+        final HashSetTreeConsumer<T> ret = new HashSetTreeConsumer<T>();
+        visit(new TreeMaker2<T>(toss, ret), null, null);
+        if (toss && ret.size() > 1) throw new Ambiguous(this);
+        return ret;
+    }
+
+    public static interface TreeConsumer<T> {
+        public void addTree(Tree<T> t);
+    }
+    public static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
+        public void addTree(Tree<T> t) { super.add(t); }
     }
 
     static        <T> Forest<T> singleton(Input.Location loc)                       { return create(loc, null, new Forest[] { }, false, true); }
@@ -39,7 +41,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 +66,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);
 
@@ -81,16 +83,15 @@ 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);
                     }
                 }, null, null);
             }
-            return h;
         }
 
         protected String  headToString()         { return null; }
@@ -121,14 +122,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     }
 
     public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    private static class TreeMaker2<T> extends TreeMaker<T> {
+        private TreeConsumer<T> tc;
+        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 addTree(Tree<T> t) { toks.add(t); }
+    }
+    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;