X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=cce7bfe6a405dadb0b7aa3e2c8f19d803ea73820;hp=e9c9a45080bd2c8bacb13db05f160f53c91136bd;hb=e086905f34b249ca1ae83c000859f2c603919a6b;hpb=5ae7d4fd7c53dab6df9aae2e42579efabf66f49e

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index e9c9a45..cce7bfe 100644
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -1,65 +1,96 @@
+// 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<T>
-    extends PrintableTree<Tree<T>>
-    implements Iterable<Tree<T>>,
-               GraphViz.ToGraphViz {
+/** <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 static final Tree[] emptyTree = new Tree[0];
+
+    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; }
 
-    private final T            head;
-    private final Tree<T>[]    children;
-    private final Input.Region location;
-    private final boolean      lift;
+    /** the element at the head of the tree */
+    public NodeType                 head()        { return ihead; }
+    public NodeType              getHead()        { return ihead; }
 
-    public T                 head()        { return head; }
+    /** the tree's children */
+    public Iterable<Tree<NodeType>> children()    { return this; }
 
-    private Tree<T> lifted() { return children[children.length-1]; }
+    /** the tree's children */
+    public Iterator<Tree<NodeType>> iterator()    { return new ArrayIterator(children); }
 
-    public int               numChildren() {
-        if (lift && children.length > 0)
-            return (children.length-1)+lifted().numChildren();
-        return children.length;
+    /** get the <tt>i</t>th child */
+    public Tree<NodeType> 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, NodeType head) {
+        location = loc;
+        ihead = head;
+        children = emptyTree;
     }
-    public Iterable<Tree<T>> children()    { return this; }
-    public Iterator<Tree<T>> iterator()    {
-        if (lift)
-            return new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1),
-                                           children[children.length-1].iterator());
-        return new ArrayIterator(children);
+    public Tree(Input.Region loc, NodeType head, List<Tree<NodeType>> kids){
+        location = loc;
+        ihead = head;
+        if (kids.size() == 0)
+            children = emptyTree;
+        else {
+            children = new Tree[kids.size()];
+            kids.toArray(children);
+        }
     }
-    public Tree<T>           child(int i)  {
-        if (lift && i >= children.length-1)
-            return children[children.length-1].child(i-(children.length-1));
-        return children[i];
+    public Tree(Input.Region loc, NodeType head, Tree<NodeType>[] kids) {
+        location = loc;
+        ihead = head;
+        children = (kids == null ? emptyTree : kids.clone());
     }
 
-    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<T>[] children) { this(loc, head, children, false); }
-    public Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
+    // 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;
-        this.lift = lift;
-
-        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);
+        }
     }
 
+
+    // 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);
+            try {
+                ((ToJava)head()).toJava(sb);
+            } catch (IOException e) { throw new RuntimeException(e); }
             return sb.toString();
         }
         return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\""));
@@ -68,97 +99,5 @@ public class Tree<T>
     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; }
-
-    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> {
-    }
-
-    public static class ArrayBuildingTreeFunctor<T> implements TreeFunctor<T,T[]>, ToJava {
-
-        public void toJava(StringBuffer sb) { sb.append("new Tree.ArrayBuildingTreeFunctor()"); }
-        public String toString() { return ""; }
-        
-        public T[] invoke(Iterable<Tree<T>> t) {
-            ArrayList ret = new ArrayList();
-            for(Tree tc : t) {
-                if (tc.head() != null && tc.head() instanceof Functor)
-                    ret.add(((Functor<Iterable<Tree>,Object>)tc.head()).invoke(tc.children()));
-                else if (tc.numChildren() == 0)
-                    ret.add(tc.head());
-                else {
-                    System.err.println("FIXME: don't know what to do about " + tc);
-                    ret.add(null);
-                }
-            }
-            return (T[])ret.toArray(new Object[0]);
-        }
-    }
-
-    public static class RawBindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
-        private Binding _binding;
-        private String _toString;
-        public RawBindingFunctor(String toString, Binding binding) {
-            this._binding = binding;
-            this._toString = toString;
-        }
-        public String toString() {
-            return _toString;
-        }
-        public void toJava(StringBuffer sb) {
-            sb.append("new Tree.RawBindingFunctor(");
-            sb.append("\"");
-            sb.append(StringUtil.toJavaString(_toString));
-            sb.append("\", ");
-            _binding.toJava(sb);
-            sb.append(")");
-        }
-        public Object invoke(Iterable<Tree<T>> t) {
-            return _binding.invoke(new Object[] { t });           
-        }
-    }
-
-    public static class BindingFunctor<T> implements TreeFunctor<T,Object>, ToJava {
-        private Binding _binding;
-        private String _toString;
-        public String toString() {
-            return _toString;
-        }
-        public BindingFunctor(String toString, Binding binding) {
-            this._binding = binding;
-            this._toString = toString;
-        }
-        public void toJava(StringBuffer sb) {
-            sb.append("new Tree.BindingFunctor(");
-            sb.append("\"");
-            sb.append(StringUtil.toJavaString(_toString));
-            sb.append("\", ");
-            _binding.toJava(sb);
-            sb.append(")");
-        }
-        public Object invoke(Iterable<Tree<T>> t) {
-            ArrayList ret = new ArrayList();
-            for(Tree tc : t) {
-                if (tc.head() != null && tc.head() instanceof Functor)
-                    ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
-                else if (tc.numChildren() == 0)
-                    ret.add(tc.head());
-                else {
-                    System.err.println("FIXME: don't know what to do about " + tc);
-                    ret.add(null);
-                }
-            }
-            Object[] o = (Object[])ret.toArray(new Object[0]);
-            return _binding.invoke(o);
-        }
-    }
 
 }