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

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 48ac386..ae2a77b 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -8,60 +8,39 @@ 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); }
-    public  static Maximal maximal(Element e)           { return new Maximal(e); }
-
-    // Instance //////////////////////////////////////////////////////////////////////////////
-    
-    final boolean zeroOkay, manyOkay;
-    final Element e;
-    final Element separator;
-
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay) { this(e, zeroOkay, manyOkay, null); }
-    Repeat(final Element e, boolean zeroOkay, boolean manyOkay, Element separator) {
-        super(e+(!manyOkay ? "?" : (zeroOkay ? "*" : "+"))+(separator==null?"":("/"+separator.toString())), true);
-        this.e = e;
-        this.zeroOkay = zeroOkay;
-        this.manyOkay = manyOkay;
-        this.separator = separator;
+    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 (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 }));
         }
     }
 
-    static class MaximalSequence extends Sequence.Singleton {
-        private final Element e;
-        public String toString() { return e+"@"; }
-        public Topology noFollow() { return e.toAtom(); }
-        public MaximalSequence(Element e) {
-            super(e, null, null);
-            this.e = e;
+    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));
         }
-    }
-    static class Maximal extends Union {
-        public Maximal(final Element e) {
-            super(e+"+", true);
-            add(new MaximalSequence(e));
+        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));
         }
     }
+
 }