X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=f87c5dc7d6761c054c337fb5e8765a7a04e77c73;hb=8a5250c184672495fae152e096b2e800749cd0db;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..f87c5dc 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -7,19 +7,19 @@ 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> {
+public class Tree
+ extends PrintableTree>
+ implements Iterable> {
private final Input.Region location;
- private final T head;
- private final Tree[] children;
+ private final NodeType head;
+ private final Tree[] children;
private final boolean lift;
/** the element at the head of the tree */
- public T head() { return head; }
+ public NodeType head() { return head; }
- private Tree lifted() { return children[children.length-1]; }
+ private Tree lifted() { return children[children.length-1]; }
/** the number of children the tree has */
public int size() {
@@ -29,10 +29,10 @@ public class Tree
}
/** the tree's children */
- public Iterable> children() { return this; }
+ public Iterable> children() { return this; }
/** the tree's children */
- public Iterator> iterator() {
+ public Iterator> iterator() {
return lift
? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
children[children.length-1].iterator())
@@ -40,7 +40,7 @@ public class Tree
}
/** get the ith child */
- public Tree child(int i) {
+ public Tree child(int i) {
return lift && i >= children.length-1
? children[children.length-1].child(i-(children.length-1))
: children[i];
@@ -49,11 +49,11 @@ public class Tree
/** 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, null); }
+ public Tree(Input.Region loc, NodeType head, Tree[] children) { this(loc, head, children, false); }
/** 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 lift) {
this.location = loc;
this.head = head;
this.lift = lift && children != null && children.length > 0;