X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=bd3b46a996fc4addea796528fd17c3864b4d4474;hp=3795c9ad19d5cdb17a2a72d9f9d1195567a82086;hb=280e93a7eec101178dc81f8009eedb2916271f09;hpb=815430f1fa820e28981bf4cff3fe15a4b9f5d97d

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 3795c9a..bd3b46a 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -12,7 +12,6 @@ import java.lang.reflect.*;
  */
 public abstract class Forest<T> implements GraphViz.ToGraphViz {
 
-
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public abstract Tree<T> expand1() throws Ambiguous;
 
@@ -20,58 +19,56 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
     public void expand(HashSet<Tree<T>> ht) { expand(ht, new HashSet<Forest<T>>(), null); }
 
     /** create a new forest */
-    public static <T> Forest<T> create(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
-        return new One<T>(loc, head, children, unwrap);
+    public static <T> Forest<T> create(Input.Region loc, T head, Forest<T>[] children, boolean lift) {
+        return new One<T>(loc, head, children, lift);
     }
 
-
     // 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);
-
 
     // One //////////////////////////////////////////////////////////////////////////////
 
     /** A "single" forest with a head and child subforests */    
-    public static class One<T> extends Forest<T> {
+    private static class One<T> extends Forest<T> {
 
         private final Input.Region      location;
         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           unwrap;
+        private final boolean           lift;
 
-        private One(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
+        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.unwrap = unwrap;
+            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, unwrap);
+            return new Tree<T>(location, head, ret, lift);
         }
 
-        public void gather(HashSet<Forest<T>> hf) {
+        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) {
+        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, unwrap));
+                ht.add(new Tree<T>(location, head, ta, lift));
             } else {
                 HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
                 children[i].expand(ht2, ignore, bogus);
@@ -95,12 +92,12 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
             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<children.length; i++) {
-                if (i==children.length-1 && unwrap && !children[i].ambiguous()) {
+                if (i==children.length-1 && lift && !children[i].ambiguous()) {
                     children[i].edges(n);
                 } else {
                     n.edge(children[i], null);
@@ -119,7 +116,7 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
     // Many //////////////////////////////////////////////////////////////////////////////
 
     /** An "ambiguity node"; this is immutable once it has been "looked at" */
-    public static class Many<T> extends Forest<T> {
+    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>>();
@@ -127,11 +124,6 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
 
         public Many() { }
 
-        public Iterator<One<T>> iterator() {
-            touched();
-            return (Iterator<One<T>>)hp.iterator();    // FIXME: fastset's iterator is not safe!
-        }
-
         public Tree<T> expand1() throws Ambiguous {
             touched();
             if (hp.size() > 1) {
@@ -151,7 +143,7 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
             return hp.iterator().next().expand1();
         }
         
-        public void gather(HashSet<Forest<T>> ht) {
+        void gather(HashSet<Forest<T>> ht) {
             touched();
             ht.add(this);
             for(Forest<T> f : hp) f.gather(ht);
@@ -160,12 +152,14 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
         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)f))
+                else for(Forest ff : ((Forest.Many<T>)f))
                     f2.add(ff);
             hp = f2;
+            */
         }
         public boolean contains(Forest f) {
             touched();
@@ -183,7 +177,7 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
             return true;
         }
 
-        public void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+        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);