X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=334874285e7f83896b9db2c4338d32f399676e89;hb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;hp=ece239dc005e5ceea961a2fb3eacf72240cb4ae3;hpb=4867dcc8c43621ec974d1d6c32736f067efd5cd1;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index ece239d..3348742 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -7,23 +7,23 @@ import java.util.*;
import java.lang.reflect.*;
import java.lang.ref.*;
-/** an element which can produce one of several alternatives */
+/** an element which can produce one of several alternatives */
public class Union extends Element implements Iterable {
private final String name;
private final boolean synthetic;
+
private final List alternatives = new ArrayList();
- public Union() { this(null, false); }
public Union(String name) { this(name, false); }
/**
* Since every cycle in a non-degenerate grammar contains at
* least one Union, every instance of this class must be able to
* display itself in both "long form" (list of the long forms of
- * its alternatives) and "short form" (some abbreviation).
+ * its alternatives) and "short form" (some name).
*
- * @param shortForm the "short form" display; usually
+ * @param shortForm the "short form" display; for display purposes only
* @param synthetic if true, this Union's "long form" is "obvious" and should not be displayed when printing the grammar
*/
public Union(String name, boolean synthetic) {
@@ -31,16 +31,13 @@ public class Union extends Element implements Iterable {
this.synthetic = synthetic;
}
- public Iterator iterator() { return alternatives.iterator(); }
public boolean contains(Sequence s) { return alternatives.contains(s); }
+ public Iterator iterator() { return alternatives.iterator(); }
/** adds an alternative */
public void add(Sequence s) {
+ if (alternatives.contains(s)) return;
alternatives.add(s);
-
- // FIXME: does this make sense?
- for(Sequence n : s.needs) add(n);
- for(Sequence n : s.hates) add(n);
}
@@ -92,7 +89,6 @@ public class Union extends Element implements Iterable {
private void bodyToString(StringBuffer sb, String before, String between) {
boolean first = true;
for(Sequence s : this) {
- if (s.lame) continue;
// FIXME: what to do here about printing out negated sequences?
sb.append(first ? before : between);
first = false;