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

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 8780d9e..484616d 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -10,27 +10,10 @@ import java.lang.ref.*;
 /** an element which can produce one of several alternatives */
 public class Union extends Element implements Iterable<Sequence> {
 
-    final String shortForm;
-    final boolean synthetic;
+    private final String name;
+    private final boolean synthetic;
     private final List<Sequence> alternatives = new ArrayList<Sequence>();
 
-    public Iterator<Sequence> iterator() { return alternatives.iterator(); }
-
-    Topology toAtom() {
-        if (alternatives.size()==0) throw new RuntimeException("cannot build an Atom from a Union with no productions");
-        Topology ret = null;
-        for(Sequence s : this) {
-            Topology a = s.toAtom();
-            if (ret==null) ret = a;
-            else           ret = ret.union(a);
-        }
-        if (ret==null) throw new RuntimeException("confusion on " + this);
-        return ret;
-    }
-
-    /** adds an alternative */
-    public void add(Sequence s) { alternatives.add(s); }
-
     /**
      *  Since every cycle in a non-degenerate grammar contains at
      *  least one Union, every instance of this class must be able to
@@ -40,63 +23,77 @@ 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(String shortForm) { this(shortForm, false); }
-    public Union(String shortForm, boolean synthetic) {
-        this.shortForm = shortForm;
+    public Union() { this(null, false); }
+    public Union(String name) { this(name, false); }
+    public Union(String name, boolean synthetic) {
+        this.name = name;
         this.synthetic = synthetic;
     }
 
-    public static Union epsilon = new Union("()");
-    static { epsilon.add(Sequence.empty); }
+    public Iterator<Sequence> iterator() { return alternatives.iterator(); }
+    public boolean contains(Sequence s) { return alternatives.contains(s); }
+
+    /** adds an alternative */
+    public void add(Sequence s) {
+        alternatives.add(s);
+
+        // FIXME: does this make sense?
+        for(Sequence n : s.needs) add(n);
+        for(Sequence n : s.hates) add(n);
+    }
+
+    // Epsilon Form //////////////////////////////////////////////////////////////////////////////
 
-    private Forest.Ref epsilonForm = null;
+    // FIXME
+    private Forest.Many epsilonForm = null;
     Forest epsilonForm() {
         if (epsilonForm != null) return epsilonForm;
-        epsilonForm = new Forest.Ref();
-        for(Sequence s : this)
-            if (s.possiblyEpsilon(null))
+        epsilonForm = new Forest.Many();
+        for(Sequence s : this) {
+            // FIXME FIXME FIXME
+            if (new Walk.Cache().possiblyEpsilon(s))
                 epsilonForm.merge(s.epsilonForm());
+        }
         return epsilonForm;
     }
 
     // Display //////////////////////////////////////////////////////////////////////////////
 
-    public String toString() { return shortForm; }
-    private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
-    public void toString(StringBuffer sb) {
-        if (synthetic) return;
+    public String getName() {
+        if (name != null) return name;
+        return "(anon_union)";
+    }
+    public String toString() {
+        if (name != null) return name;
+        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(pad(15, shortForm) + "::= ");
-        } else for(Sequence s : this) {
-            sb.append(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;
     }
-
-    // SubUnion //////////////////////////////////////////////////////////////////////////////
-
-    /** FIXME this is kind of a hack */
-    public class Subset extends Union {
-        private final Set<Sequence> exclude;
-        public Subset(String shortForm, Set<Sequence> exclude) { super(shortForm, true); this.exclude = exclude; }
-        public Iterator<Sequence> iterator() {
-            final Iterator<Sequence> it = Union.this.iterator();
-            return new Iterator<Sequence>() {
-                private Sequence next = it.hasNext() ? it.next() : null;
-                public boolean hasNext() { return next != null; }
-                public Sequence next() {
-                    Sequence ret = next;
-                    do {
-                        next = it.hasNext() ? it.next() : null;
-                    } while (next != null && (next instanceof Sequence) && exclude.contains((Sequence)next));
-                    return ret;
-                }
-                public void remove() { throw new Error(); }
-            };
+    
+    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());
         }
     }