X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=47f5b49a4c55f0090d70f9e9652926c7acbc6999;hb=fdfbcb35985749c03225bdef24ad5e4add42661b;hp=086a9bb36a8bdbd14cdb12aa969538231b525c1b;hpb=2bee2b032b0422d212e17082cc4dcbf28cb897ac;p=sbp.git diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java index 086a9bb..47f5b49 100644 --- a/src/edu/berkeley/sbp/Tree.java +++ b/src/edu/berkeley/sbp/Tree.java @@ -1,7 +1,7 @@ package edu.berkeley.sbp; import 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.*; @@ -12,43 +12,69 @@ public class Tree implements Iterable>, GraphViz.ToGraphViz { - final T head; - Tree[] children; - final Input.Region location; + private final Input.Region location; + private final T head; + private final Tree[] children; + private final boolean lift; public T head() { return head; } - public int numChildren() { return children.length; } - public Iterable> children() { return new ArrayIterator(children); } - public Iterator> iterator() { return new ArrayIterator(children); } - public Tree child(int i) { return children[i]; } + + private Tree lifted() { return children[children.length-1]; } + + public int numChildren() { + return lift + ? (children.length-1)+lifted().numChildren() + : children.length; + } + public Iterable> children() { return this; } + public Iterator> iterator() { + return lift + ? new ConcatenateIterator(new ArrayIterator(children, 0, children.length-1), + children[children.length-1].iterator()) + : new ArrayIterator(children); + } + + public Tree child(int i) { + return lift && i >= children.length-1 + ? children[children.length-1].child(i-(children.length-1)) + : children[i]; + } 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) { + 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, T head, Tree[] children, boolean lift) { this.location = loc; this.head = head; + this.lift = lift && children != null && children.length > 0; Tree[] children2 = children==null ? new Tree[0] : new Tree[children.length]; if (children != null) System.arraycopy(children, 0, children2, 0, children.length); this.children = children2; } - protected String headToString() { return head==null?null:head.toString(); } + + // PrintableTree ///////////////////////////////////////////////////////////////////////////// + + protected String headToString() { return head()==null?null:head().toString(); } protected String headToJava() { // FIXME - if (head==null) return null; - if (head instanceof ToJava) { + if (head()==null) return null; + if (head() instanceof ToJava) { StringBuffer sb = new StringBuffer(); - ((ToJava)head).toJava(sb); + ((ToJava)head()).toJava(sb); return sb.toString(); } - return (head==null?"null":("\""+StringUtil.toJavaString(head.toString())+"\"")); + return (head()==null?"null":("\""+StringUtil.toJavaString(head().toString())+"\"")); } protected String left() { return "{"; } protected String right() { return "}"; } 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); @@ -60,19 +86,55 @@ public class Tree public boolean isTransparent() { return false; } public boolean isHidden() { return false; } - public static interface TreeFunctor extends Functor>, R> { - } + public static interface TreeFunctor extends Functor>, R> { } - public static class ArrayBuildingTreeFunctor implements TreeFunctor, ToJava { + + public static class RawBindingFunctor implements TreeFunctor, 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> t) { + return _binding.invoke(new Object[] { t }); + } + } - public void toJava(StringBuffer sb) { sb.append("new Tree.ArrayBuildingTreeFunctor()"); } - public String toString() { return ""; } - - public T[] invoke(Iterable> t) { + public static class BindingFunctor implements TreeFunctor, 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> t) { ArrayList ret = new ArrayList(); for(Tree tc : t) { if (tc.head() != null && tc.head() instanceof Functor) - ret.add(((Functor,Object>)tc.head()).invoke(tc.children())); + ret.add(((Tree.TreeFunctor)tc.head()).invoke(tc.children())); else if (tc.numChildren() == 0) ret.add(tc.head()); else { @@ -80,7 +142,8 @@ public class Tree ret.add(null); } } - return (T[])ret.toArray(new Object[0]); + Object[] o = (Object[])ret.toArray(new Object[0]); + return _binding.invoke(o); } }