X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=5ff00d669a165256cd7c8835f0a698c02a756624;hb=6ff6d681e214e91ca3fa5afdff60a0fb88227404;hp=6cba89c9cd9cbae6afff924a05106dfd3367f758;hpb=297f374e023e781f38f3fb2d6122c951f224380e;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 6cba89c..5ff00d6 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
package edu.berkeley.sbp;
import edu.berkeley.sbp.util.*;
import edu.berkeley.sbp.*;
@@ -7,75 +9,101 @@ 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.
+ *
+ *
+ * Unlike the other Elements, Union is not immutable once
+ * constructed. To simulate this desirable feature, it is immutable
+ * once examined by taking its iterator or calling contains().
+ */
public class Union extends Element implements Iterable {
+ /*private*/ final String name;
+ /*private*/ final boolean synthetic;
+ private boolean viewed = false;
+
+ private final List alternatives = new ArrayList();
+
+ 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() { this(null, false); }
- public Union(String shortForm) { this(shortForm, false); }
- public Union(String shortForm, boolean synthetic) {
- this.shortForm = shortForm;
+ public Union(String name, boolean synthetic) {
+ this.name = name;
this.synthetic = synthetic;
}
- final String shortForm;
- final boolean synthetic;
- private final List alternatives = new ArrayList();
+ public boolean contains(Sequence s) {
+ viewed = true;
+ return alternatives.contains(s);
+ }
- public Iterator iterator() { return alternatives.iterator(); }
- public boolean contains(Sequence s) { return alternatives.contains(s); }
+ /** iterator over this Union's Sequences */
+ public Iterator iterator() {
+ viewed = true;
+ return alternatives.iterator();
+ }
/** adds an alternative */
public void add(Sequence s) {
+ /*
+ FIXME
+ if (viewed)
+ throw new RuntimeException("attempt to add a Sequence to a Union that has already been examined:\n "+this);
+ */
+ 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);
+ /** adds a one-element sequence */
+ public void add(Element e) {
+ add(Sequence.create(e));
}
- // Epsilon Form //////////////////////////////////////////////////////////////////////////////
- // FIXME
- public static Union epsilon = new Union("()");
- static { epsilon.add(Sequence.empty); }
+ // Epsilon Form //////////////////////////////////////////////////////////////////////////////
// FIXME
- private Forest.Many epsilonForm = null;
- Forest epsilonForm() {
- if (epsilonForm != null) return epsilonForm;
- epsilonForm = new Forest.Many();
+ //private Forest.Many epsilonForm = null;
+ Forest epsilonForm(Input.Region loc) {
+ //if (epsilonForm != null) return epsilonForm;
+ Forest.Many epsilonForm = new Forest.Many();
for(Sequence s : this) {
// FIXME FIXME FIXME
if (new Walk.Cache().possiblyEpsilon(s))
- epsilonForm.merge(s.epsilonForm());
+ epsilonForm.merge(s.epsilonForm(loc));
}
return epsilonForm;
}
+
// Display //////////////////////////////////////////////////////////////////////////////
public String getName() {
- if (shortForm != null) return shortForm;
+ if (name != null) return name;
return "(anon_union)";
}
public String toString() {
- if (shortForm != null) return shortForm;
+ viewed = true;
+ if (name != null) return name;
StringBuffer sb = new StringBuffer();
sb.append("(");
bodyToString(sb, "", " | ");
sb.append(")");
return sb.toString();
}
+
+ /** display this union in long/expanded form */
public StringBuffer toString(StringBuffer sb) {
+ viewed = true;
if (synthetic) return sb;
boolean first = true;
String before = StringUtil.pad(15, getName()) + " = ";
@@ -91,9 +119,9 @@ public class Union extends Element implements Iterable {
}
private void bodyToString(StringBuffer sb, String before, String between) {
+ viewed = true;
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;