X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=bc450fbcca15295294d2deb8ec58a0512e70588e;hp=a6cbd3a01a76b73af94ca6f8d10e51a9457c5ba3;hb=770c5b545d72f8562c0337a0aa800e53c521d842;hpb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98
diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index a6cbd3a..bc450fb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,64 +1,57 @@
+// 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.*;
-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>,
- GraphViz.ToGraphViz {
-
- private final Input.Region location;
- private final T head;
- private final Tree[] children;
- private final boolean lift;
-
- /** the element at the head of the tree */
- public T head() { return head; }
+public class Tree
+ extends PrintableTree>
+ implements Iterable> {
- 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 numChildren() {
- return lift
- ? (children.length-1)+lifted().numChildren()
- : 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, null); }
+ public Tree(Input.Region loc, NodeType head, Tree[] children) { this(loc, head, children, false); }
+ // 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 lift) {
this.location = loc;
- this.head = head;
- this.lift = lift && children != null && children.length > 0;
- this.children = ArrayUtil.clone(children, Tree.class);
+ this.ihead = head;
+ if (lift && children != null && children.length > 0) {
+ Tree last = children[children.length-1];
+ this.children = new Tree[(children.length-1)+last.children.length];
+ System.arraycopy(children, 0, this.children, 0, children.length-1);
+ if (last.children.length > 0)
+ System.arraycopy(last.children, 0, this.children, children.length-1, last.children.length);
+ } else {
+ this.children = ArrayUtil.clone(children, Tree.class);
+ }
}
@@ -80,16 +73,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; }
-
}