X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=7b115326c82a2ec0170078392fcd0840cfc26c4e;hb=e02870181effb947d72e5aa91137dd0c7ff84ce1;hp=4f4baacb62315f466039ca27283f7366d5c1f631;hpb=4eeae516c2ef96ca11d24f23fd5e80d12e7734a6;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 4f4baac..7b11532 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -18,10 +18,15 @@ 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) {
-        TreeMaker<T> ret = new TreeMaker<T>();
-        invoke(ret, new Boolean(toss), null);
-        if (toss && ret.size() > 1) throw new Ambiguous(this);
-        return ret;
+        final HashSet<Tree<T>> hs = new HashSet<Tree<T>>();
+        TreeMaker<T> ret = new TreeMaker<T>(toss) {
+            public void add(Input.Location loc) {
+                hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+            }
+        };
+        visit(ret, null, null);
+        if (toss && hs.size() > 1) throw new Ambiguous(this);
+        return hs;
     }
 
     static        <T> Forest<T> singleton(Input.Location loc)                       { return create(loc, null, new Forest[] { }, false, true); }
@@ -34,12 +39,12 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // Body //////////////////////////////////////////////////////////////////////////////
 
     protected static interface Body<T> {
-        TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h);
+        TreeMaker<T> expand(int i, TreeMaker<T> h);
     }
 
     protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
-        public <B,C> void invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
+        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             ivbc.invoke(this, b, c);
         }
 
@@ -59,27 +64,28 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.singleton = singleton;
         }
 
-        public TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h) {
+        public TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
             if (singleton) {
-                tokens[0].invoke(h, toss, i);
-
-            } else if (i==tokens.length) {
-                h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
+                tokens[0].visit(h, null, i);
+                return h;
+            }
+            if (i==0) h.head(tag);
+            if (i==tokens.length) {
+                h.add(/*FIXME*/null);
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)
-                    tokens[i].invoke(h, toss, 0);
+                    tokens[i].visit(h, null, 0);
 
             } else {
-                boolean hit = false;
-                for(Tree<T> r : tokens[i].expand(toss)) {
-                    hit = true;
-                    int old = h.toks.size();
-                    h.toks.add(r);
-                    expand(toss, i+1, h);
-                    while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
-                }
-                //if (!hit) throw new Error();
+                tokens[i].visit(new TreeMaker<T>(h.toss) {
+                    public void add(Input.Location loc) {
+                        int old = h.toks.size();
+                        h.toks.add(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;
         }
@@ -103,24 +109,30 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }
-        public <B,C> void invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
+        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             if (hp==null) return;
-            for(Forest<T> f : hp) f.invoke(ivbc, b, c);
+            for(Forest<T> f : hp)
+                f.visit(ivbc, b, c);
         }
         public Forest resolve() { return this; }
     }
 
-    public abstract <B,C> void invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-    private static class TreeMaker<T> extends HashSet<Tree<T>> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    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> {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
-        public void invoke(Forest.Body<T> bod, Boolean toss, Integer i) {
+        private boolean toss;
+        protected T head;
+        public TreeMaker(boolean toss) { this.toss = toss; }
+        public void head(T head) { this.head = head; }
+        public abstract void add(Input.Location loc);
+        public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;
                 this.toks = new ArrayList<Tree<T>>();
-                bod.expand(toss, 0, this);
+                bod.expand(0, this);
                 this.toks = toks;
             } else {
-                bod.expand(toss, i, this);
+                bod.expand(i, this);
             }
         }
     }