X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=037e67d58b06571328e674d05eb0cbe2cd8fbacb;hp=2dd39286674c447357796f446e76f14577fdb00a;hb=b8a597c8d1a29afc24f9b89f726d5b1a9b9aeec1;hpb=225993309e6183afa9a88fc13d39df56be54b992

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 2dd3928..037e67d 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -8,18 +8,24 @@ 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 */
-/* FIXME make private again */ public class Repeat extends Union {
+class Repeat extends Union {
 
-    public 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, Object tag) {
+        this(e, zeroOkay, manyOkay, null, false, 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) {
+        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));
+            //add(new Sequence.Constant.Empty());
+            // FUGLY
+            add(new Sequence.Singleton(Sequence.many1(e, separator, tag)));
         } else {
             add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
             if (separator==null)
@@ -27,9 +33,21 @@ 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)
+    }
+
+    public static class Maximal extends Repeat {
+        public Maximal(final Element e, boolean zeroOkay, boolean manyOkay, final Atom 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==null ? e : separator));
+                s.follow = (Atom)separator.complement();
+        }
+        public Maximal(final Atom e, boolean zeroOkay, boolean manyOkay, Object tag) {
+            super(e, zeroOkay, manyOkay, null, true, tag);
+            for(Sequence s : this)
+                s.follow = (Atom)e.complement();
+        }
     }
+
 }