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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index e53bfcb..7d872ad 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,71 +7,66 @@ 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 {
+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; }
 
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public abstract Tree<T> expand1() throws Ambiguous;
 
     /** expand this forest into a set of trees */
     public void expand(HashSet<Tree<T>> ht) { expand(ht, new HashSet<Forest<T>>(), null); }
-    public abstract void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus);
-    public abstract void gather(HashSet<Forest<T>> ignore);
-    public HashSet<Tree<T>> expand(boolean toss) {
-        HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
-        expand(ret);
-        return ret;
-    }
 
-    public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
-        return new Body<T>(loc, tag, tokens, unwrap);
+    /** 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);
     }
+
+    // Package-Private //////////////////////////////////////////////////////////////////////////////
+
+    abstract void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus);
+    abstract void gather(HashSet<Forest<T>> ignore);
+
     public abstract void edges(GraphViz.Node n);
     public boolean ambiguous() { return false; }
 
     // Body //////////////////////////////////////////////////////////////////////////////
 
-    public /*protected*/ static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {
+    private static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {
 
         private final Input.Region      location;
-        private final T                 tag;
-        private final Forest<T>[]       tokens;
+        private final T                 head;
+        private final Forest<T>[]       children;
         private final boolean           unwrap;
 
-        private Body(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
+        private Body(Input.Region loc, T head, Forest<T>[] children, 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.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[tokens.length];
-            for(int i=0; i<tokens.length; i++)
-                ret[i] = tokens[i].expand1();
-            return new Tree<T>(location, tag, ret, unwrap);
+            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 : tokens) f.gather(hf);
+            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[tokens.length], ht, ignore, bogus);
+            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==tokens.length) {
-                ht.add(new Tree<T>(location, tag, ta, unwrap));
+            if (i==children.length) {
+                ht.add(new Tree<T>(location, head, ta, unwrap));
             } else {
                 HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
-                tokens[i].expand(ht2, ignore, bogus);
+                children[i].expand(ht2, ignore, bogus);
                 for(Tree<T> tc : ht2) {
                     ta[i] = tc;
                     expand(i+1, ta, ht, ignore, bogus);
@@ -96,16 +91,16 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<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);
+            for(int i=0; i<children.length; i++) {
+                if (i==children.length-1 && unwrap && !children[i].ambiguous()) {
+                    children[i].edges(n);
                 } else {
-                    n.edge(tokens[i], null);
+                    n.edge(children[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 "}"; }
@@ -163,11 +158,12 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.Body<T>>*/
         }
 
         // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
-
+        /*
         public int toInt() {
             if (hp.size()==1) return hp.iterator().next().toInt();
             return super.toInt();
         }
+        */
         public boolean isTransparent() { return hp.size()==1; }
         public boolean isHidden() { return hp.size()==0; }
         public void edges(GraphViz.Node n) {