X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=2dd39286674c447357796f446e76f14577fdb00a;hb=225993309e6183afa9a88fc13d39df56be54b992;hp=3e9b2b6c7fe8f949db881e8918ea94ad3246c584;hpb=242a8711e98cbd3ed6d05271bf910fde38e9be9a;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 3e9b2b6..2dd3928 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -8,54 +8,28 @@ 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 */
-public class Repeat extends Union {
+/* FIXME make private again */ public class Repeat extends Union {
 
-    /** repeat zero or one times */
-    public  static Repeat maybe(Element e)              { return new Repeat(e, true, false); }
-    /** repeat zero or more times */
-    public  static Repeat many0(Element e)              { return new Repeat(e, true, true); }
-    /** repeat zero or more times, separated by <tt>sep</tt> */
-    public  static Repeat many0(Element e, Element sep) { return new Repeat(e, true, true, sep); }
-    /** repeat one or more times */
-    public  static Repeat many1(Element e)              { return new Repeat(e, false, true); }
-    /** repeat one or more times, separated by <tt>sep</tt> */
-    public  static Repeat many1(Element e, Element sep) { return new Repeat(e, false, true, sep); }
-
-    /** repeat zero or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal0(Element e)              { return new Repeat(e, true, true, null, true); }
-    /** repeat one or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal1(Element e)              { return new Repeat(e, false, true, null, true); }
-    /** repeat one or more times, separated by <tt>sep</tt>, matching a maximal sequence of atoms */
-    public  static Repeat maximal1(Element e, Element sep) { return new Repeat(e, false, true, sep, true); }
-
-    // Instance //////////////////////////////////////////////////////////////////////////////
-    
-    final boolean zeroOkay, manyOkay;
-    final Element e;
-    final Element separator;
-    final boolean maximal;
-
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay) { this(e, zeroOkay, manyOkay, null); }
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay, Element separator) { this(e, zeroOkay, manyOkay, separator, false); }
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal) {
-        super(e+(!manyOkay ? "?" : (zeroOkay ? "*" : "+"))+(separator==null?"":("/"+separator.toString())), true);
-        this.e = e;
-        this.maximal = maximal;
-        this.zeroOkay = zeroOkay;
-        this.manyOkay = manyOkay;
-        this.separator = separator;
+    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) {
+        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(many1(e, separator), null, null));
-            else          add(new Sequence.Singleton(e, null, null));
+            if (manyOkay) add(new Sequence.Singleton(Sequence.many1(e, separator)));
+            else          add(new Sequence.Singleton(e));
         } else {
-            add(new Sequence.RewritingSequence(null, new Element[] { e }, null, null));
-            if (this.separator==null) {
-                add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }, null, null));
-            } else {
-                add(new Sequence.Unwrap(new Element[] { e, this.separator, Repeat.this }, new boolean[] { false, true, false }, null, null));
-            }
+            add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
+            if (separator==null)
+                add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }, tag));
+            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;
+        // 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));
     }
 }