X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=89199c5e55dfeeaa9a7b33ff896a280121b885f9;hp=b7e7e39703f54e35c426427f6e804f076cc18648;hb=74e53cbf7227f5958ff7495abe31cb0462d62c4e;hpb=9a51c5df6d121f44c34a60fea128c5da7c3dba87

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index b7e7e39..89199c5 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -16,10 +16,15 @@ class Repeat extends Union {
         this(e, zeroOkay, manyOkay, separator, false, tag); }
     protected Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal, Object tag) {
         super(e+(!manyOkay ? "?" : (zeroOkay ? (maximal ? "**" : "*") : (maximal ? "++" : "+")))+(separator==null?"":("/"+separator)), true);
-        if (zeroOkay) {
+        if (zeroOkay && !manyOkay) {
             add(new Sequence.Constant.Empty());
-            if (manyOkay) add(new Sequence.Singleton(Sequence.many1(e, separator)));
-            else          add(new Sequence.Singleton(e));
+            add(new Sequence.Singleton(e));
+            return;
+        }
+        if (zeroOkay) {
+            add(new Sequence.RewritingSequence(tag, new Element[] { }, null));
+            // FUGLY
+            add(new Sequence.Singleton(Sequence.many1(e, separator, tag)));
         } else {
             add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
             if (separator==null)