projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed tibdoc
[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
6b615dc
..
d9d035a
100644
(file)
--- a/
src/edu/berkeley/sbp/Sequence.java
+++ b/
src/edu/berkeley/sbp/Sequence.java
@@
-12,8
+12,6
@@
public abstract class Sequence extends Element implements Iterable<Element> {
// Static Constructors //////////////////////////////////////////////////////////////////////////////
// Static Constructors //////////////////////////////////////////////////////////////////////////////
- public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); s.needed.add(ret); return ret; }
- public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
abstract Sequence _clone();
Sequence dup() {
Sequence ret = _clone();
abstract Sequence _clone();
Sequence dup() {
Sequence ret = _clone();
@@
-53,6
+51,9
@@
public abstract class Sequence extends Element implements Iterable<Element> {
return Atom.toAtom(elements[0]);
}
return Atom.toAtom(elements[0]);
}
+ public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); s.needed.add(ret); return ret; }
+ public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
+
protected final Element[] elements;
final HashSet<Sequence> needed = new HashSet<Sequence>();
protected final Element[] elements;
final HashSet<Sequence> needed = new HashSet<Sequence>();