X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=484616d6c9bdcd77c875ede13738f8bc409d80f7;hp=4595ebbec869a88a4ccbc9d1192313a8caf03c30;hb=38eb7943a4be918d46cb6517004e57ca91410ce0;hpb=03f91bd299c8c8724fe966f527b7410d2cea675d

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 4595ebb..484616d 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -10,6 +10,10 @@ import java.lang.ref.*;
 /** an element which can produce one of several alternatives */
 public class Union extends Element implements Iterable<Sequence> {
 
+    private final String name;
+    private final boolean synthetic;
+    private final List<Sequence> alternatives = new ArrayList<Sequence>();
+
     /**
      *  Since every cycle in a non-degenerate grammar contains at
      *  least one Union, every instance of this class must be able to
@@ -20,16 +24,12 @@ public class Union extends Element implements Iterable<Sequence> {
      *  @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) { this(name, false); }
+    public Union(String name, boolean synthetic) {
+        this.name = name;
         this.synthetic = synthetic;
     }
 
-    final String shortForm;
-    final boolean synthetic;
-    private final List<Sequence> alternatives = new ArrayList<Sequence>();
-
     public Iterator<Sequence> iterator() { return alternatives.iterator(); }
     public boolean contains(Sequence s) { return alternatives.contains(s); }
 
@@ -45,14 +45,10 @@ public class Union extends Element implements Iterable<Sequence> {
     // Epsilon Form //////////////////////////////////////////////////////////////////////////////
 
     // FIXME
-    public static Union epsilon = new Union("()");
-    static { epsilon.add(Sequence.empty); }
-
-    // FIXME
-    private Forest.Ref epsilonForm = null;
+    private Forest.Many epsilonForm = null;
     Forest epsilonForm() {
         if (epsilonForm != null) return epsilonForm;
-        epsilonForm = new Forest.Ref();
+        epsilonForm = new Forest.Many();
         for(Sequence s : this) {
             // FIXME FIXME FIXME
             if (new Walk.Cache().possiblyEpsilon(s))
@@ -64,11 +60,11 @@ public class Union extends Element implements Iterable<Sequence> {
     // 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;
+        if (name != null) return name;
         StringBuffer sb = new StringBuffer();
         sb.append("(");
         bodyToString(sb, "", " | ");