checkpoint

[sbp.git] / src / edu / berkeley / sbp / Union.java

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 6cba89c..99ef42b 100644 (file)
--- 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> {
 
 /** 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
     /**
      *  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); }
      *  @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;
     }
 
         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); }
 
     public Iterator<Sequence> iterator() { return alternatives.iterator(); }
     public boolean contains(Sequence s) { return alternatives.contains(s); }
 

@@ -64,11 +64,11 @@ public class Union extends Element implements Iterable<Sequence> {
     // Display //////////////////////////////////////////////////////////////////////////////
 
     public String getName() {
     // Display //////////////////////////////////////////////////////////////////////////////
 
     public String getName() {

-        if (shortForm != null) return shortForm;
+        if (name != null) return name;

         return "(anon_union)";
     }
     public String toString() {
         return "(anon_union)";
     }
     public String toString() {

-        if (shortForm != null) return shortForm;
+        if (name != null) return name;

         StringBuffer sb = new StringBuffer();
         sb.append("(");
         bodyToString(sb, "", " | ");
         StringBuffer sb = new StringBuffer();
         sb.append("(");
         bodyToString(sb, "", " | ");