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
/
Sequence.java
diff --git
a/src/edu/berkeley/sbp/Sequence.java
b/src/edu/berkeley/sbp/Sequence.java
index
2eddfc4
..
3ac811e
100644
(file)
--- a/
src/edu/berkeley/sbp/Sequence.java
+++ b/
src/edu/berkeley/sbp/Sequence.java
@@
-46,13
+46,11
@@
public abstract class Sequence extends Element implements Iterable<Element> {
////////////////////////////////////////////////////////////////////////////////
public Element noFollow = null;
////////////////////////////////////////////////////////////////////////////////
public Element noFollow = null;
- public String name = null;
- public void setName(String name) { this.name = name; }
- public final Topology noFollow() { return noFollow==null ? null : noFollow.toAtom(); }
+ public final Topology noFollow() { return noFollow==null ? null : Atom.toAtom(noFollow); }
Topology toAtom() {
if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
Topology toAtom() {
if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
- return elements[0].toAtom();
+ return Atom.toAtom(elements[0]);
}
protected final Element[] elements;
}
protected final Element[] elements;