X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=ab6ff7a7e303394579c6e6aa5d9ed5e83b8f3d3e;hp=d655aa406985258d22beb143242893345b98d7a2;hb=8cf79c4b9e5a26ef65bd4af600946b45dbf28a8a;hpb=a09bae7235677c1b3b77f827bdd6722a9e88a122

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index d655aa4..ab6ff7a 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,9 +1,8 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.bind.*;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
@@ -13,19 +12,12 @@ public class Tree<NodeType>
     extends PrintableTree<Tree<NodeType>>
     implements Iterable<Tree<NodeType>> {
 
-    private final Input.Region location;
-    private final NodeType     ihead;
-    private final Tree<NodeType>[]    children;
-    private final boolean      lift;
-
-    private Tree<NodeType> lifted() { return children[children.length-1]; }
+    private final Input.Region     location;
+    private final NodeType         ihead;
+    private final Tree<NodeType>[] children;
 
     /** the number of children the tree has */
-    public int               size() {
-        return lift
-            ? (children.length-1)+lifted().size()
-            : children.length;
-    }
+    public int               size() { return children.length; }
 
     /** the element at the head of the tree */
     public NodeType                 head()        { return ihead; }
@@ -35,32 +27,36 @@ public class Tree<NodeType>
     public Iterable<Tree<NodeType>> children()    { return this; }
 
     /** the tree's children */
-    public Iterator<Tree<NodeType>> iterator()    {
-        return lift
-            ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
-                                      children[children.length-1].iterator())
-            : new ArrayIterator(children);
-    }
+    public Iterator<Tree<NodeType>> iterator()    { return new ArrayIterator(children); }
 
     /** get the <tt>i</t>th child */
-    public Tree<NodeType> child(int i)  {
-        return lift && i >= children.length-1
-            ? children[children.length-1].child(i-(children.length-1))
-            : children[i];
-    }
+    public Tree<NodeType> child(int i)            { return children[i]; }
 
     /** 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) {
+    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean[] lifts) {
         this.location = loc;
         this.ihead = head;
-        this.lift = lift && children != null && children.length > 0;
-        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);
+        }
     }