checkpoint

[sbp.git] / src / edu / berkeley / sbp / Forest.java

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index e7c0be4..634d6ad 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -90,6 +90,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
     public boolean ambiguous() { return false; }
     public /*protected*/ static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
+        private final Input.Region      location;
+        private final T                 tag;
+        private final Forest<T>[]       tokens;
+        private final boolean           unwrap;
+
         public boolean isTransparent() { return false; }
         public boolean isHidden() { return false; }
         public GraphViz.Node toGraphViz(GraphViz gv) {
@@ -118,11 +123,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             ivbc.invoke(this, b, c);
         }
 
-        private final Input.Region      location;
-        private final T                 tag;
-        private final Forest<T>[]       tokens;
-        private final boolean           unwrap;
-
         private MyBody(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
             this.location = loc;
             this.tag = tag;
@@ -136,10 +136,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         }
         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>(location, tag, trees));
+                target.add(new Tree<T>(location, tag, trees, unwrap));
                 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()];
@@ -148,10 +149,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
                         trees2[trees.length-1+j] = tree.child(j);
                     target.add(new Tree<T>(location, tag, trees2));
                 } else {
+                */
                     trees[i] = tree;
                     gather(tl, ht, target, trees, i+1);
                     trees[i] = null;
-                }
+                    //}
             }
         }
         public void expand(TaskList tl, HashSet<Tree<T>> ht) {
@@ -169,9 +171,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             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) {
@@ -179,7 +183,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
                     public void addTree(Tree<T> t) { toks.add(t); }
                     public void finish(T head, Input.Region loc) {
                         int old = h.toks.size();
-                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), unwrap));
                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
                     }