X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=cdf8a8b634784b7c40ae2c5cce62e0e716d0764d;hp=00f826a9e792fc2b8b42af5b14ee2786a82ea377;hb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;hpb=4ca0bc9a5bf2519c0e2cff2e988a6a7ffc6c7d9e

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 00f826a..cdf8a8b 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -6,51 +6,83 @@ import java.io.*;
 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.Body<T>>*/
-    implements IntegerMappable,
-               GraphViz.ToGraphViz {
-
-    private static int master_idx = 0;
-    private final int idx = master_idx++;
-    public int toInt() { return idx; }
+/**
+ *   <font color=blue>
+ *   An efficient representation of a collection of trees (Tomita's
+ *   shared packed parse forest).
+ *   </font>
+ */
+public abstract class Forest<T> implements GraphViz.ToGraphViz {
 
     /** 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 abstract void expand(HashSet<Tree<T>> ht);
-    public HashSet<Tree<T>> expand(boolean toss) {
-        HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
-        expand(ret);
-        return ret;
-    }
+    public void expand(HashSet<Tree<T>> ht) { expand(ht, new HashSet<Forest<T>>(), null); }
 
-    private static class InnerAmbiguous extends RuntimeException {
-        public final Forest<?> f;
-        public InnerAmbiguous(Forest<?> f) { this.f = f; }
+    /** create a new forest */
+    public static <T> Forest<T> create(Input.Region loc, T head, Forest<T>[] children, boolean lift) {
+        return new One<T>(loc, head, children, lift);
     }
 
-    static        <T> Forest<T> leaf(Input.Region loc, T tag) { return create(loc, tag, null, false); }
-    public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
-        return new Body<T>(loc, tag, tokens, unwrap);
-    }
-    // Body //////////////////////////////////////////////////////////////////////////////
+    // Package-Private //////////////////////////////////////////////////////////////////////////////
+
+    abstract void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus);
+    abstract void gather(HashSet<Forest<T>> ignore);
+    abstract void edges(GraphViz.Node n);
+    boolean ambiguous() { return false; }
+
 
-    public abstract void edges(GraphViz.Node n);
-    public boolean ambiguous() { return false; }
-    public /*protected*/ static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {
+    // One //////////////////////////////////////////////////////////////////////////////
+
+    /** A "single" forest with a head and child subforests */    
+    private static class One<T> extends Forest<T> {
 
         private final Input.Region      location;
-        private final T                 tag;
-        private final Forest<T>[]       tokens;
-        private final boolean           unwrap;
+        private final T                 head;
+        private final Forest<T>[]       children;
+
+        /** if true, the last child's children are considered children of this node */
+        private final boolean           lift;
+
+        private One(Input.Region loc, T head, Forest<T>[] children, boolean lift) {
+            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.lift = lift;
+        }
+
+        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, lift);
+        }
+
+        void gather(HashSet<Forest<T>> hf) {
+            hf.add(this);
+            for(Forest<T> f : children) f.gather(hf);
+        }
+        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);
+        }
+        private 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, lift));
+            } 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; }
@@ -59,50 +91,23 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<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;
         }
-        boolean edges = false;
+        boolean edges = false; // FIXME ??
         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);
+            for(int i=0; i<children.length; i++) {
+                if (i==children.length-1 && lift && !children[i].ambiguous()) {
+                    children[i].edges(n);
                 } else {
-                    n.edge(tokens[i], null);
+                    n.edge(children[i], null);
                 }
             }
         }
 
-        private Body(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
-            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;
-        }
-
-        public void expand(HashSet<Tree<T>> ht) {
-            expand(0, new Tree[tokens.length], ht);
-        }
-        public void expand(final int i, Tree<T>[] ta, HashSet<Tree<T>> ht) {
-            if (i==tokens.length) {
-                ht.add(new Tree<T>(location, tag, ta, unwrap));
-                return;
-            }
-            HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
-            tokens[i].expand(ht2);
-            for(Tree<T> tc : ht2) {
-                ta[i] = tc;
-                expand(i+1, ta, ht);
-                ta[i] = 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 "}"; }
@@ -110,34 +115,78 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<T>>*/
     }
 
 
-    // Ref //////////////////////////////////////////////////////////////////////////////
+    // Many //////////////////////////////////////////////////////////////////////////////
+
+    /** An "ambiguity node"; this is immutable once it has been "looked at" */
+    static class Many<T> extends Forest<T> {
+
+        HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
+        private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
+        private boolean touched = false;
+
+        public Many() { }
+
+        public Tree<T> expand1() throws Ambiguous {
+            touched();
+            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();
+        }
+        
+        void gather(HashSet<Forest<T>> ht) {
+            touched();
+            ht.add(this);
+            for(Forest<T> f : hp) f.gather(ht);
+        }
 
-    /**
-     *  This class represents a partially complete collection of
-     *  forests to be viewed as a forest at some later date; once
-     *  viewed, it becomes immutable
-     */
-    static class Ref<T> extends Forest<T> {
-        public void expand(HashSet<Tree<T>> ht) {
-            for (Forest<T> f : hp)
-                f.expand(ht);
+        private void touched() {
+            if (touched) return;
+            touched = true;
+            /*
+            FastSet<Forest<T>> f2 = new FastSet<Forest<T>>();
+            for(Forest f : hp)
+                if (f instanceof Forest.One) f2.add(f);
+                else for(Forest ff : ((Forest.Many<T>)f))
+                    f2.add(ff);
+            hp = f2;
+            */
         }
-        public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
         public boolean contains(Forest f) {
+            touched();
             return hp.contains(f);
         }
-        public boolean ambiguous() {
+        public void merge(Forest p) { 
+            if (touched) throw new RuntimeException("attempt to merge() on a Forest.Many that has already been examined");
+            if (p==this) throw new RuntimeException("attempt to merge() a Forest.Many to itself!");
+            hp.add(p, true);
+        }
+        boolean ambiguous() {
+            touched();
             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() { }
-        public int toInt() {
-            if (hp.size()==1) return hp.iterator().next().toInt();
-            return super.toInt();
+
+        void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            touched();
+            if (ignore.contains(this)) { ht.add(bogus); return; }
+            for (Forest<T> f : hp) f.expand(ht, ignore, bogus);
         }
-        public void merge(Forest p) { if (p!=this) hp.add(p, true); }
+
+
+        // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
 
         public boolean isTransparent() { return hp.size()==1; }
         public boolean isHidden() { return hp.size()==0; }
@@ -146,7 +195,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<T>>*/
             for(Forest f : hp) f.edges(n);
         }
         public GraphViz.Node toGraphViz(GraphViz gv) {
-            //if (hp.size()==0) return null;
             if (hp.size()==1) return hp.iterator().next().toGraphViz(gv);
             if (gv.hasNode(this)) return gv.createNode(this);
             GraphViz.Node n = gv.createNode(this);
@@ -155,8 +203,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<T>>*/
             for(Forest f : hp) n.edge(f, null);
             return n;
         }
-
-        public Forest resolve() { return this; }
     }
 
     // Statics //////////////////////////////////////////////////////////////////////////////