X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=ae2a77b8a881d97f2a02373d48c6705a02b22fd6;hp=c4e948627cf8903076ed3feb85796abf7dad5714;hb=d2559f2903cbd048ece9abfb7828d7ca10187812;hpb=74fc87dc827975ed4e9e411bb169a5f5bfb1010f

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index c4e9486..ae2a77b 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -15,8 +15,6 @@ import java.lang.ref.*;
     }
     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 (maximal && zeroOkay && separator != null)
-            throw new RuntimeException("cannot create a maximal repetition of zero or more items with a separator (yet): " + this);
         if (zeroOkay) {
             add(new Sequence.Constant.Empty());
             if (manyOkay) add(new Sequence.Singleton(Sequence.many1(e, separator)));
@@ -28,15 +26,20 @@ import java.lang.ref.*;
             else
                 add(new Sequence.Unwrap(new Element[] { e, separator,      Repeat.this }, tag, new boolean[] { false, true, false }));
         }
-        // FIXME: hack!
-        if (maximal)
-            for(Sequence s : this)
-                s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(separator==null ? e : separator));
     }
 
     public static class Maximal extends Repeat {
         public Maximal(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, Object tag) {
             super(e, zeroOkay, manyOkay, separator, true, tag);
+            if (zeroOkay && separator != null)
+                throw new RuntimeException("cannot create a maximal repetition of zero or more items with a separator (yet): " + this);
+            for(Sequence s : this)
+                s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(separator));
+        }
+        public Maximal(final Element e, boolean zeroOkay, boolean manyOkay, Object tag) {
+            super(e, zeroOkay, manyOkay, null, true, tag);
+            for(Sequence s : this)
+                s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(e));
         }
     }