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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index cadf343..7d872ad 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,91 +7,75 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** an efficient representation of a collection of trees (Tomita's shared packed parse forest) */
-public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
-    implements Visitable<Forest.Body<T>>,
-               IntegerMappable,
-               GraphViz.ToGraphViz {
+public abstract class Forest<T> implements GraphViz.ToGraphViz {
 
-    private static int master_idx = 0;
-    private final int idx = master_idx++;
-    public int toInt() { return idx; }
-
-    public abstract void expand(TaskList tl, HashSet<Tree<T>> ht);
-    public abstract void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target);
-
-    public static class TaskList extends ArrayList<TaskList.Task> {
-        public interface Task {
-            public void perform();
-        }
-        public class ExpandTask implements Task {
-            private Forest f;
-            private HashSet hs;
-            public ExpandTask(Forest f, HashSet hs) { this.f = f; this.hs = hs; }
-            public void perform() { f.expand(TaskList.this, hs); }
-        }
-        public class GatherTask implements Task {
-            private Forest f;
-            private HashSet[] ht;
-            private HashSet hs;
-            public GatherTask(Forest f, HashSet<Tree<?>>[] ht, HashSet<Tree<?>> hs) { this.f = f; this.hs = hs; this.ht = ht;}
-            public void perform() { f.gather(TaskList.this, ht, hs); }
-        }
-        public void expand(Forest f, HashSet hs) {
-            add(new ExpandTask(f, hs));
-        }
-        public void gather(Forest f, HashSet[] ht, HashSet hs) {
-            add(new GatherTask(f, ht, hs));
-        }
-        public void run() {
-            while(true) {
-                if (isEmpty()) return;
-                Task task = get(size()-1);
-                remove(size()-1);
-                task.perform();
-            }
-        }
-    }
 
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
-    public final Tree<T> expand1() throws Ambiguous, ParseFailed {
-        try {
-            Iterator<Tree<T>> it = expand(true).iterator();
-            if (!it.hasNext()) throw new ParseFailed();
-            return it.next();
-        } catch (InnerAmbiguous ia) { throw new Ambiguous(ia.f); }
-    }
+    public abstract Tree<T> expand1() throws Ambiguous;
 
     /** expand this forest into a set of trees */
-    public HashSet<Tree<T>> expand(boolean toss) {
-        TaskList tl = new TaskList();
-        HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
-        tl.expand(this, ret);
-        tl.run();
+    public void expand(HashSet<Tree<T>> ht) { expand(ht, new HashSet<Forest<T>>(), null); }
 
-        if (toss && ret.size() > 1) throw new InnerAmbiguous(this);
-        return ret;
+    /** create a new forest node */
+    public static <T> Forest<T> create(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
+        return new Body<T>(loc, head, children, unwrap);
     }
 
-    private static class InnerAmbiguous extends RuntimeException {
-        public final Forest<?> f;
-        public InnerAmbiguous(Forest<?> f) { this.f = f; }
-    }
+    // Package-Private //////////////////////////////////////////////////////////////////////////////
 
-    static        <T> Forest<T> singleton(Input.Location loc, Position p) {
-        return create(loc, null, new Forest[] { }, false, true, p); }
-    static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) { return body; }
-    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
-        return new MyBody<T>(loc, tag, tokens, unwrap, singleton, p);
-    }
-    // Body //////////////////////////////////////////////////////////////////////////////
+    abstract void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus);
+    abstract void gather(HashSet<Forest<T>> ignore);
 
-    public /*protected*/ static interface Body<T> extends GraphViz.ToGraphViz {
-        void expand(int i, TreeBuilder<T> h);
-    }
     public abstract void edges(GraphViz.Node n);
     public boolean ambiguous() { return false; }
-    public /*protected*/ static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
+
+    // Body //////////////////////////////////////////////////////////////////////////////
+
+    private static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {
+
+        private final Input.Region      location;
+        private final T                 head;
+        private final Forest<T>[]       children;
+        private final boolean           unwrap;
+
+        private Body(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
+            this.location = loc;
+            this.head = head;
+            this.children = children==null ? emptyForestArray : new Forest[children.length];
+            if (children != null) System.arraycopy(children, 0, this.children, 0, children.length);
+            if (children != null) for(int i=0; i<children.length; i++) if (children[i]==null) throw new Error(i+"");
+            this.unwrap = unwrap;
+        }
+
+        public Tree<T> expand1() throws Ambiguous {
+            Tree<T>[] ret = new Tree[children.length];
+            for(int i=0; i<children.length; i++)
+                ret[i] = children[i].expand1();
+            return new Tree<T>(location, head, ret, unwrap);
+        }
+        public void gather(HashSet<Forest<T>> hf) {
+            hf.add(this);
+            for(Forest<T> f : children) f.gather(hf);
+        }
+        public void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (ignore.contains(this)) { ht.add(bogus); return; }
+            expand(0, new Tree[children.length], ht, ignore, bogus);
+        }
+        public void expand(final int i, Tree<T>[] ta, HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (i==children.length) {
+                ht.add(new Tree<T>(location, head, ta, unwrap));
+            } else {
+                HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
+                children[i].expand(ht2, ignore, bogus);
+                for(Tree<T> tc : ht2) {
+                    ta[i] = tc;
+                    expand(i+1, ta, ht, ignore, bogus);
+                    ta[i] = null;
+                }
+            }
+        }
+
+        // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
 
         public boolean isTransparent() { return false; }
         public boolean isHidden() { return false; }
@@ -100,7 +84,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             GraphViz.Node n = gv.createNode(this);
             n.label = headToString()==null?"":headToString();
             n.directed = true;
-            n.comment = reduction==null?null:reduction+"";
             edges(n);
             return n;
         }
@@ -108,101 +91,16 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         public void edges(GraphViz.Node n) {
             if (edges) return;
             edges = true;
-            for(int i=0; i<tokens.length; i++) {
-                if (i==tokens.length-1 && unwrap && !tokens[i].ambiguous()) {
-                    tokens[i].edges(n);
-                } else {
-                    n.edge(tokens[i], null);
-                }
-            }
-        }
-
-        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
-            ivbc.invoke(this, b, c);
-        }
-
-        private final Input.Location    location;
-        private final T                 tag;
-        private final Forest<T>[]       tokens;
-        private final boolean           unwrap;
-        private final boolean           singleton;
-        private final Sequence.Position reduction;
-
-        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
-            this.location = loc;
-            this.tag = tag;
-            this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
-            if (tokens != null) System.arraycopy(tokens, 0, this.tokens, 0, tokens.length);
-            if (tokens != null) for(int i=0; i<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");
-            this.unwrap = unwrap;
-            this.singleton = singleton;
-            this.reduction = reduction;
-        }
-        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
-            gather(tl, ht, target, new Tree[ht.length], 0);
-        }
-        private void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target, Tree[] trees, int i) {
-            if (i==ht.length) {
-                target.add(new Tree<T>(null, tag, trees));
-                return;
-            }
-            for(Tree<T> tree : ht[i]) {
-                if (unwrap && i==trees.length-1) {
-                    // I think this is wrong
-                    Tree[] trees2 = new Tree[trees.length - 1 + tree.numChildren()];
-                    System.arraycopy(trees, 0, trees2, 0, trees.length-1);
-                    for(int j=0; j<tree.numChildren(); j++)
-                        trees2[trees.length-1+j] = tree.child(j);
-                    target.add(new Tree<T>(null, tag, trees2));
+            for(int i=0; i<children.length; i++) {
+                if (i==children.length-1 && unwrap && !children[i].ambiguous()) {
+                    children[i].edges(n);
                 } else {
-                    trees[i] = tree;
-                    gather(tl, ht, target, trees, i+1);
-                    trees[i] = null;
+                    n.edge(children[i], null);
                 }
             }
         }
-        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
-            if (singleton) {
-                tokens[0].expand(tl, ht);
-                return;
-            }
-            HashSet<Tree<T>>[] children = new HashSet[tokens.length];
-            tl.gather(this, children, ht);
-            for(int i=0; i<children.length; i++) {
-                children[i] = new HashSet<Tree<T>>();
-                tl.expand(tokens[i], children[i]);
-            }
-        }
-
-        public void expand(final int i, final TreeBuilder<T> h) {
-            if (singleton) {
-                tokens[0].visit(h, null, i);
-                return;
-            }
-            if (i==0) h.start(tag, location);
-
-            if (i==tokens.length) {
-                h.finish(tag, location);
-
-            } else if (unwrap && i==tokens.length-1) {
-                if (tokens[i] != null)
-                    tokens[i].visit(h, null, 0);
-
-            } else {
-                tokens[i].visit(new TreeBuilder<T>(h.toss) {
-                    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.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);
-            }
-        }
 
-        protected String  headToString()         { return tag==null?null:tag.toString(); }
+        protected String  headToString()         { return head==null?null:head.toString(); }
         protected String  headToJava()           { return "null"; }
         protected String  left()                 { return "{"; }
         protected String  right()                { return "}"; }
@@ -218,29 +116,54 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {
-        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
-            for (Forest<T> f : hp) f.expand(tl, ht);
+        public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
+        private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
+
+        public Ref() { }
+
+        public Tree<T> expand1() throws Ambiguous {
+            if (hp.size() > 1) {
+                HashSet<Forest<T>> hf0 = new HashSet<Forest<T>>();
+                Iterator<Forest<T>> ih = hp.iterator();
+                ih.next().gather(hf0);
+                for(Forest<T> f : hp) {
+                    HashSet<Forest<T>> hf1 = new HashSet<Forest<T>>();
+                    f.gather(hf1);
+                    hf0.retainAll(hf1);
+                }
+                HashSet<Tree<T>> ht = new HashSet<Tree<T>>();
+                expand(ht, hf0, new Tree(null, "*"));
+                throw new Ambiguous((Forest<?>)this,
+                                    (HashSet<Tree<?>>)(Object)ht);
+            }
+            return hp.iterator().next().expand1();
         }
-        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
-            throw new Error();
+        
+        public void gather(HashSet<Forest<T>> ht) {
+            ht.add(this);
+            for(Forest<T> f : hp) f.gather(ht);
         }
-        public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
-        public boolean contains(Forest f) {
-            return hp.contains(f);
+
+        public Forest resolve() { return this; }
+        public void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (ignore.contains(this)) { ht.add(bogus); return; }
+            for (Forest<T> f : hp) f.expand(ht, ignore, bogus);
         }
+        public boolean contains(Forest f) { return hp.contains(f); }
+        public void merge(Forest p) { if (p!=this) hp.add(p, true); }
         public boolean ambiguous() {
             if (hp.size()==0) return false;
             if (hp.size()==1) return hp.iterator().next().ambiguous();
             return true;
         }
-        private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
-        public Ref() { }
+
+        // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
+        /*
         public int toInt() {
             if (hp.size()==1) return hp.iterator().next().toInt();
             return super.toInt();
         }
-        public void merge(Forest p) { if (p!=this) hp.add(p, true); }
-
+        */
         public boolean isTransparent() { return hp.size()==1; }
         public boolean isHidden() { return hp.size()==0; }
         public void edges(GraphViz.Node n) {
@@ -257,17 +180,8 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             for(Forest f : hp) n.edge(f, null);
             return n;
         }
-
-        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.visit(ivbc, b, c);
-        }
-        public Forest resolve() { return this; }
     }
 
-    public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];