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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 1c8fbc5..bd3b46a 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -19,18 +19,17 @@ 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 //////////////////////////////////////////////////////////////////////////////
 
@@ -42,21 +41,21 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
         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);
         }
 
         void gather(HashSet<Forest<T>> hf) {
@@ -69,7 +68,7 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
         }
         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);
@@ -98,7 +97,7 @@ public abstract class Forest<T> implements GraphViz.ToGraphViz {
             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);