allow lifts on any position

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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 1f55a90..5f7f73d 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -35,32 +35,27 @@ public class Tree<NodeType>
     /** get the input region that this tree was parsed from */
     public Input.Region    getRegion() { return location; }
 
-    public Tree(Input.Region loc, NodeType head)                            { this(loc, head, null); }
-    public Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children) { this(loc, head, children, false); }
+    public Tree(Input.Region loc, NodeType head)                            { this(loc, head, new Tree[0]); }
+    public Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children) { this(loc, head, children, new boolean[children==null?0:children.length]); }
 
     // FIXME: fairly inefficient because we keep copying arrays
     /** package-private constructor, allows setting the "lift" bit */
-    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean lift) {
-        this(loc, head, children, lift, false);
-    }
-    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean lift, boolean liftLeft) {
+    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean[] lifts) {
         this.location = loc;
         this.ihead = head;
-        // FIXME: lift+liftLeft togheter
-        if (liftLeft && children != null && children.length > 0) {
-            Tree<NodeType> last = children[0];
-            this.children = new Tree[(children.length-1)+last.children.length];
-            System.arraycopy(children, 1, this.children, last.children.length, children.length-1);
-            if (last.children.length > 0)
-                System.arraycopy(last.children, 0, this.children, 0, last.children.length);
-        } else if (lift && children != null && children.length > 0) {
-            Tree<NodeType> last = children[children.length-1];
-            this.children = new Tree[(children.length-1)+last.children.length];
-            System.arraycopy(children, 0, this.children, 0, children.length-1);
-            if (last.children.length > 0)
-                System.arraycopy(last.children, 0, this.children, children.length-1, last.children.length);
-        } else {
-            this.children = ArrayUtil.clone(children, Tree.class);
+
+        int count = 0;
+        for(int i=0; i<children.length; i++)
+            count += lifts[i] ? children[i].size() : 1;
+
+        this.children = new Tree[count];
+        int j = 0;
+        for(int i=0; i<children.length; i++) {
+            if (!lifts[i])
+                this.children[j++] = children[i];
+            else
+                for(int k=0; k<children[i].size(); k++)
+                    this.children[j++] = children[i].child(k);
         }
     }