X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=bc450fbcca15295294d2deb8ec58a0512e70588e;hp=cdd3b8bee479a4dc71843a7e6d98af4b94953d70;hb=770c5b545d72f8562c0337a0aa800e53c521d842;hpb=474037fe8463b96dfaf0209be157cbf5223a0910

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index cdd3b8b..bc450fb 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,60 +1,76 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
 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<T>
-    extends PrintableTree<Tree<T>>
-    implements Iterable<Tree<T>>,
-               GraphViz.ToGraphViz {
-
-    final T           head;
-          Tree<T>[]   children;
-          Object[]    labels;
-    final Input.Location    location;
-
-    public T                 head()        { return head; }
-    public int               numChildren() { return children.length; }
-    public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
-    public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
-    public Tree<T>           child(int i)  { return children[i]; }
-    public Object            label(int i)  { return labels[i]; }
-
-    public Input.Location    getLocation() { return location; }
-
-    public Tree(Input.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children) { this(loc, head, children, null); }
-    public Tree(Input.Location loc, T head, Tree<T>[] children, Object[] labels) {
-        this.location = loc;
-        this.head = head;
+/** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
+public class Tree<NodeType>
+    extends PrintableTree<Tree<NodeType>>
+    implements Iterable<Tree<NodeType>> {
+
+    private final Input.Region     location;
+    private final NodeType         ihead;
+    private final Tree<NodeType>[] children;
+
+    /** the number of children the tree has */
+    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<Tree<NodeType>> children()    { return this; }
+
+    /** the tree's children */
+    public Iterator<Tree<NodeType>> iterator()    { return new ArrayIterator(children); }
 
-        Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
-        if (children != null) System.arraycopy(children, 0, children2, 0, children.length);
-        this.children = children2;
+    /** get the <tt>i</t>th child */
+    public Tree<NodeType> child(int i)            { return children[i]; }
 
-        Object[] labels2 = labels==null ? new Object[0] : new Object[labels.length];
-        if (labels != null) System.arraycopy(labels, 0, labels2, 0, labels.length);
-        this.labels = labels2;
+    /** get the input region that this tree was parsed from */
+    public Input.Region    getRegion() { return location; }
+
+    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); }
+
+    // FIXME: fairly inefficient because we keep copying arrays
+    /** package-private constructor, allows setting the "lift" bit */
+    Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children, boolean lift) {
+        this.location = loc;
+        this.ihead = head;
+        if (lift && children != null && children.length > 0) {
+            Tree<NodeType> 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);
+        }
     }
 
-    protected String headToString() { return head==null?null:head.toString(); }
-    protected String headToJava()   { return head==null?null:StringUtil.toJavaString(head+""); }
+
+    // PrintableTree /////////////////////////////////////////////////////////////////////////////
+
+    protected String headToString() { return head()==null?null:head().toString(); }
+    protected String headToJava()   {
+      // FIXME
+        if (head()==null) return null;
+        if (head() instanceof ToJava) {
+            StringBuffer sb = new StringBuffer();
+            ((ToJava)head()).toJava(sb);
+            return sb.toString();
+        }
+        return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\""));
+    }
     protected String left()   { return "{"; }
     protected String right()  { return "}"; }
     protected boolean ignoreSingleton() { return false; }
 
-    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();
-        //n.color = "red";
-        for(Tree t : this) n.edge(t, null);
-        return n;
-    }
-    public boolean isTransparent() { return false; }
-    public boolean isHidden() { return false; }
+
 }