X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=5f7f73d22fd306303d10fa49f96274a37c59d892;hp=e7f2ef785a4630775df9b860b0ceafbf5a962d19;hb=584cef55d8811e3215858fde22e708d2a3d1cf70;hpb=b0d313eb49712b23f9c71003c96f130f23a63526

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index e7f2ef7..5f7f73d 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,35 +1,81 @@
+// 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>> {
+/** <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); }
 
-    final T           head;
-          Tree<T>[]   children;
-    final Token.Location    location;
+    /** get the <tt>i</t>th child */
+    public Tree<NodeType> child(int i)            { return children[i]; }
 
-    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]; }
+    /** get the input region that this tree was parsed from */
+    public Input.Region    getRegion() { return location; }
 
-    public       Token.Location    getLocation() { return location; }
+    public Tree(Input.Region loc, NodeType head)                            { this(loc, head, new Tree[0]); }
+    public Tree(Input.Region loc, NodeType head, Tree<NodeType>[] children) { this(loc, head, children, new boolean[children==null?0:children.length]); }
 
-    public Tree(Token.Location loc, T head)                   { this(loc, head, null); }
-    public Tree(Token.Location loc, T head, Tree<T>[] children) {
+    // 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[] lifts) {
         this.location = loc;
-        this.head = head;
-        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;
+        this.ihead = head;
+
+        int count = 0;
+        for(int i=0; i<children.length; i++)
+            count += lifts[i] ? children[i].size() : 1;
+
+        this.children = new Tree[count];
+        int j = 0;
+        for(int i=0; i<children.length; i++) {
+            if (!lifts[i])
+                this.children[j++] = children[i];
+            else
+                for(int k=0; k<children[i].size(); k++)
+                    this.children[j++] = children[i].child(k);
+        }
     }
 
-    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; }
+
+
 }