X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=5ff00d669a165256cd7c8835f0a698c02a756624;hb=6ff6d681e214e91ca3fa5afdff60a0fb88227404;hp=5932ac39ec7423a1c124afa28dc6eef896d0c2ab;hpb=24112db237318c030b4d4f457d90c34fd69d652b;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 5932ac3..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,11 +9,19 @@ import java.util.*;
 import java.lang.reflect.*;
 import java.lang.ref.*;
 
-/** an element which can produce one of several alternatives */
+/**
+ *  <font color=green>an element which can produce one of several alternatives</font>.
+ *  <p>
+ *
+ *  Unlike the other Elements, Union is not immutable once
+ *  constructed.  To simulate this desirable feature, it is immutable
+ *  <i>once examined</i> by taking its iterator or calling contains().
+ */
 public class Union extends Element implements Iterable<Sequence> {
 
-    private final String name;
-    private final boolean synthetic;
+    /*private*/ final String name;
+    /*private*/ final boolean synthetic;
+    private boolean viewed = false;
 
     private final List<Sequence> alternatives = new ArrayList<Sequence>();
 
@@ -31,27 +41,45 @@ public class Union extends Element implements Iterable<Sequence> {
         this.synthetic = synthetic;
     }
 
-    public boolean contains(Sequence s) { return alternatives.contains(s); }
-    public Iterator<Sequence> iterator() { return alternatives.iterator(); }
+    public boolean contains(Sequence s) {
+        viewed = true;
+        return alternatives.contains(s);
+    }
+
+    /** iterator over this Union's Sequences */
+    public Iterator<Sequence> 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;
     }
@@ -64,6 +92,7 @@ public class Union extends Element implements Iterable<Sequence> {
         return "(anon_union)";
     }
     public String toString() {
+        viewed = true;
         if (name != null) return name;
         StringBuffer sb = new StringBuffer();
         sb.append("(");
@@ -71,7 +100,10 @@ public class Union extends Element implements Iterable<Sequence> {
         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 +119,7 @@ public class Union extends Element implements Iterable<Sequence> {
     }
     
     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?