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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 8368673..d655aa4 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
@@ -7,19 +9,16 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
-public class Tree<T>
-    extends PrintableTree<Tree<T>>
-    implements Iterable<Tree<T>> {
+public class Tree<NodeType>
+    extends PrintableTree<Tree<NodeType>>
+    implements Iterable<Tree<NodeType>> {
 
     private final Input.Region location;
-    private final T            head;
-    private final Tree<T>[]    children;
+    private final NodeType     ihead;
+    private final Tree<NodeType>[]    children;
     private final boolean      lift;
 
-    /** the element at the head of the tree */
-    public T                 head()        { return head; }
-
-    private Tree<T> lifted() { return children[children.length-1]; }
+    private Tree<NodeType> lifted() { return children[children.length-1]; }
 
     /** the number of children the tree has */
     public int               size() {
@@ -28,11 +27,15 @@ public class Tree<T>
             : 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<Tree<T>> children()    { return this; }
+    public Iterable<Tree<NodeType>> children()    { return this; }
 
     /** the tree's children */
-    public Iterator<Tree<T>> iterator()    {
+    public Iterator<Tree<NodeType>> iterator()    {
         return lift
             ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
                                       children[children.length-1].iterator())
@@ -40,7 +43,7 @@ public class Tree<T>
     }
 
     /** get the <tt>i</t>th child */
-    public Tree<T> child(int i)  {
+    public Tree<NodeType> child(int i)  {
         return lift && i >= children.length-1
             ? children[children.length-1].child(i-(children.length-1))
             : children[i];
@@ -49,13 +52,13 @@ public class Tree<T>
     /** 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<T>[] 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<NodeType>[] children) { this(loc, head, children, false); }
 
     /** package-private constructor, allows setting the "lift" bit */
-    Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
+    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean lift) {
         this.location = loc;
-        this.head = head;
+        this.ihead = head;
         this.lift = lift && children != null && children.length > 0;
         this.children = ArrayUtil.clone(children, Tree.class);
     }