X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=d655aa406985258d22beb143242893345b98d7a2;hb=b7cd03704a32c751575472eadfd433ce15694fce;hp=a6cbd3a01a76b73af94ca6f8d10e51a9457c5ba3;hpb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index a6cbd3a..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,33 +9,33 @@ 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>,
- GraphViz.ToGraphViz {
+public class Tree
+ extends PrintableTree>
+ implements Iterable> {
private final Input.Region location;
- private final T head;
- private final Tree[] children;
+ private final NodeType ihead;
+ private final Tree[] children;
private final boolean lift;
- /** the element at the head of the tree */
- public T 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 numChildren() {
+ public int size() {
return lift
- ? (children.length-1)+lifted().numChildren()
+ ? (children.length-1)+lifted().size()
: 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() {
+ public Iterator> iterator() {
return lift
? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
children[children.length-1].iterator())
@@ -41,7 +43,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];
@@ -50,13 +52,13 @@ 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.ihead = head;
this.lift = lift && children != null && children.length > 0;
this.children = ArrayUtil.clone(children, Tree.class);
}
@@ -80,16 +82,4 @@ public class Tree
protected boolean ignoreSingleton() { return false; }
- // ToGraphViz /////////////////////////////////////////////////////////////////////////////
-
- public GraphViz.Node toGraphViz(GraphViz gv) {
- if (gv.hasNode(this)) return gv.createNode(this);
- GraphViz.Node n = gv.createNode(this);
- n.label = head()==null ? "" : head().toString();
- for(Tree t : this) n.edge(t, null);
- return n;
- }
- public boolean isTransparent() { return false; }
- public boolean isHidden() { return false; }
-
}