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 dce9cbe..4595ebb 100644 (file)
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -19,6 +19,7 @@ public class Union extends Element implements Iterable<Sequence> {
      *  @param shortForm the "short form" display; usually 
      *  @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;
@@ -62,21 +63,42 @@ public class Union extends Element implements Iterable<Sequence> {
 
     // Display //////////////////////////////////////////////////////////////////////////////
 
-    public String toString() { return shortForm; }
+    public String getName() {
+        if (shortForm != null) return shortForm;
+        return "(anon_union)";
+    }
+    public String toString() {
+        if (shortForm != null) return shortForm;
+        StringBuffer sb = new StringBuffer();
+        sb.append("(");
+        bodyToString(sb, "", " | ");
+        sb.append(")");
+        return sb.toString();
+    }
     public StringBuffer toString(StringBuffer sb) {
         if (synthetic) return sb;
         boolean first = true;
+        String before = StringUtil.pad(15, getName()) + " = ";
         if (alternatives.size()==0) {
-            sb.append(StringUtil.pad(15, shortForm) + " = ");
-        } else for(Sequence s : this) {
+            sb.append(before);
+        } else {
+            bodyToString(sb,
+                         before,
+                         "\n" + StringUtil.pad(15, "")        + " | ");
+            sb.append('\n');
+        }
+        return sb;
+    }
+    
+    private void bodyToString(StringBuffer sb, String before, String between) {
+        boolean first = true;
+        for(Sequence s : this) {
+            if (s.lame) continue;
             // FIXME: what to do here about printing out negated sequences?
-            sb.append(StringUtil.pad(15, first ? shortForm : "") + (first ? " = " : "  | "));
+            sb.append(first ? before : between);
             first = false;
             sb.append(s.toString());
-            sb.append('\n');
         }
-        sb.append('\n');
-        return sb;
     }
 
 }