X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=cce7bfe6a405dadb0b7aa3e2c8f19d803ea73820;hp=a6cbd3a01a76b73af94ca6f8d10e51a9457c5ba3;hb=e086905f34b249ca1ae83c000859f2c603919a6b;hpb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98
diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index a6cbd3a..cce7bfe 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,64 +1,82 @@
+// 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>,
- GraphViz.ToGraphViz {
-
- 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 static final Tree[] emptyTree = new Tree[0];
- 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) {
+ location = loc;
+ ihead = head;
+ children = emptyTree;
+ }
+ public Tree(Input.Region loc, NodeType head, List> kids){
+ location = loc;
+ ihead = head;
+ if (kids.size() == 0)
+ children = emptyTree;
+ else {
+ children = new Tree[kids.size()];
+ kids.toArray(children);
+ }
+ }
+ public Tree(Input.Region loc, NodeType head, Tree[] kids) {
+ location = loc;
+ ihead = head;
+ children = (kids == null ? emptyTree : kids.clone());
+ }
+ // 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
if (head()==null) return null;
if (head() instanceof ToJava) {
StringBuffer sb = new StringBuffer();
- ((ToJava)head()).toJava(sb);
+ try {
+ ((ToJava)head()).toJava(sb);
+ } catch (IOException e) { throw new RuntimeException(e); }
return sb.toString();
}
return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\""));
@@ -80,16 +100,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; }
-
}