projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
Tree.java
diff --git
a/src/edu/berkeley/sbp/Tree.java
b/src/edu/berkeley/sbp/Tree.java
index
b867766
..
220d1dd
100644
(file)
--- a/
src/edu/berkeley/sbp/Tree.java
+++ b/
src/edu/berkeley/sbp/Tree.java
@@
-11,6
+11,7
@@
public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
final T head;
Tree<T>[] children;
final T head;
Tree<T>[] children;
+ Object[] labels;
final Input.Location location;
public T head() { return head; }
final Input.Location location;
public T head() { return head; }
@@
-18,16
+19,23
@@
public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
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 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 Input.Location getLocation() { return location; }
public Tree(Input.Location loc, T head) { this(loc, head, null); }
public Tree(Input.Location loc, T head) { this(loc, head, null); }
- public Tree(Input.Location loc, T head, Tree<T>[] children) {
+ 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;
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;
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;
+
+ 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;
}
protected String headToString() { return head==null?null:head.toString(); }
}
protected String headToString() { return head==null?null:head.toString(); }