X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=ab6ff7a7e303394579c6e6aa5d9ed5e83b8f3d3e;hb=d020e44a27745001cc0c9826fa3aee629da25d43;hp=836867398c03fe3192519d721a2810d4db7d9a02;hpb=f09d2abb95f106197aea99c345282c3bf0cd3717;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 8368673..ab6ff7a 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,63 +1,62 @@
+// 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.*;
/** a tree (or node in a tree); see jargon.txt for details */
-public class Tree
- extends PrintableTree>
- implements Iterable> {
-
- private final Input.Region location;
- private final T head;
- private final Tree[] children;
- private final boolean lift;
+public class Tree
+ extends PrintableTree>
+ implements Iterable> {
- /** the element at the head of the tree */
- public T head() { return head; }
-
- private Tree lifted() { return children[children.length-1]; }
+ private final Input.Region location;
+ private final NodeType ihead;
+ private final Tree[] 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; }
+ public NodeType getHead() { return ihead; }
/** the tree's children */
- public Iterable> children() { return this; }
+ public Iterable> children() { return this; }
/** the tree's children */
- public Iterator> iterator() {
- return lift
- ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
- children[children.length-1].iterator())
- : new ArrayIterator(children);
- }
+ public Iterator> iterator() { return new ArrayIterator(children); }
/** get the ith child */
- public Tree child(int i) {
- return lift && i >= children.length-1
- ? children[children.length-1].child(i-(children.length-1))
- : children[i];
- }
+ public Tree 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, T head) { this(loc, head, null); }
- public Tree(Input.Region loc, T head, Tree[] 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[] 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, T head, Tree[] children, boolean lift) {
+ Tree(Input.Region loc, NodeType head, Tree[] children, boolean[] lifts) {
this.location = loc;
- this.head = head;
- this.lift = lift && children != null && children.length > 0;
- this.children = ArrayUtil.clone(children, Tree.class);
+ this.ihead = head;
+
+ int count = 0;
+ for(int i=0; i