X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=474a5421a8e783eca00c22e9a8dbe9d5ab154120;hp=5932ac39ec7423a1c124afa28dc6eef896d0c2ab;hb=4061f053ccd06b1e833c523b26001942e8c5afcd;hpb=24112db237318c030b4d4f457d90c34fd69d652b
diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 5932ac3..474a542 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,11 +9,19 @@ 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 String name;
private final boolean synthetic;
+ private boolean viewed = false;
private final List alternatives = new ArrayList();
@@ -31,27 +41,45 @@ public class Union extends Element implements Iterable {
this.synthetic = synthetic;
}
- public boolean contains(Sequence s) { return alternatives.contains(s); }
- public Iterator iterator() { return alternatives.iterator(); }
+ public boolean contains(Sequence s) {
+ viewed = true;
+ 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);
}
+ /** adds a one-element sequence */
+ public void add(Element e) {
+ add(Sequence.create(e));
+ }
+
// 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;
}
@@ -59,11 +87,11 @@ public class Union extends Element implements Iterable {
// Display //////////////////////////////////////////////////////////////////////////////
- public String getName() {
- if (name != null) return name;
- return "(anon_union)";
- }
+ boolean isSynthetic() { return synthetic; }
+ String getName() { return name==null ? "(anon_union)" : name; }
+
public String toString() {
+ viewed = true;
if (name != null) return name;
StringBuffer sb = new StringBuffer();
sb.append("(");
@@ -71,7 +99,10 @@ public class Union extends Element implements Iterable {
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()) + " = ";
@@ -87,6 +118,7 @@ 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) {
// FIXME: what to do here about printing out negated sequences?