X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=6cba89c9cd9cbae6afff924a05106dfd3367f758;hb=9b7ce1d3e4ac84ecd2d0f5f461b42c40f38e4783;hp=70a3e45753a8e4912a2edf343a8131922d5cd592;hpb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 70a3e45..6cba89c 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -19,19 +19,15 @@ 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;
         this.synthetic = synthetic;
     }
 
-    /** display form for the Union (ie not including the RHS) */
     final String shortForm;
-
-    /** this is just a hint to use when printing out the grammar in visual form */
     final boolean synthetic;
-
-    /** the actual alternatives */
     private final List<Sequence> alternatives = new ArrayList<Sequence>();
 
     public Iterator<Sequence> iterator() { return alternatives.iterator(); }
@@ -53,10 +49,10 @@ public class Union extends Element implements Iterable<Sequence> {
     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))
@@ -67,20 +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(StringUtil.pad(15, first ? shortForm : "") + (first ? " = " : "  | "));
-            first = false;
-            sb.append(s.toString());
+            sb.append(before);
+        } else {
+            bodyToString(sb,
+                         before,
+                         "\n" + StringUtil.pad(15, "")        + " | ");
             sb.append('\n');
         }
-        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(first ? before : between);
+            first = false;
+            sb.append(s.toString());
+        }
+    }
 
 }