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

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 4868135..ae2a77b 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -8,14 +8,13 @@ import java.lang.reflect.*;
 import java.lang.ref.*;
 
 /** currently this class exports only static methods to create repetitions; there are no public instance methods or constructors */
-class Repeat extends Union {
+/* FIXME make private again */ public class Repeat extends Union {
 
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal) {
-        this(e, zeroOkay, manyOkay, separator, maximal, null); }
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal, Object tag) {
+    public Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, Object tag) {
+        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 (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)));
@@ -27,6 +26,21 @@ class Repeat extends Union {
             else
                 add(new Sequence.Unwrap(new Element[] { e, separator,      Repeat.this }, tag, new boolean[] { false, true, false }));
         }
-        if (maximal) for(Sequence s : this) s.noFollow = 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));
+        }
+    }
+
 }