checkpoint

[sbp.git] / src / edu / berkeley / sbp / Forest.java

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 5807545..a8c44f0 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -18,13 +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 add(Tree<T> t) { hs.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); }
@@ -37,10 +41,10 @@ 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 */, Invokable<Tree<T>, TreeMaker<T>, Integer> {
+    protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             ivbc.invoke(this, b, c);
@@ -62,12 +66,15 @@ 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;
+            }
+            if (i==0) h.start(tag, location);
 
-            } else if (i==tokens.length) {
-                h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
+            if (i==tokens.length) {
+                h.finish(tag, location);
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)
@@ -75,23 +82,16 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
-                    public void add(Tree<T> r) {
+                    public void start(T head, Input.Location loc) { }
+                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.toks.add(r);
+                        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;
-        }
-        public void invoke(Tree<T> r, TreeMaker<T> h, Integer i) {
-            //hit = true;
-            int old = h.toks.size();
-            h.toks.add(r);
-            expand(i+1, h);
-            while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
-            //ivbc.invoke(this, b, c);
         }
 
         protected String  headToString()         { return null; }
@@ -122,11 +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 add(Tree<T> t);
+        public abstract void start(T head, Input.Location loc);
+        public abstract void finish(T head, Input.Location loc);
+        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;