X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=ae2a77b8a881d97f2a02373d48c6705a02b22fd6;hb=d2559f2903cbd048ece9abfb7828d7ca10187812;hp=bd0dbe0a43764009bc064995d93ed9b1a7622551;hpb=b648ea33534fea67c9926a67b38d2e992c2f5752;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index bd0dbe0..ae2a77b 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -8,43 +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 sep */
- 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 sep */
- 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 an atom sep, matching a maximal sequence */
- public static Repeat maximal1(Element e, Element sep) { return new Repeat(e, false, true, sep, true); }
-
- private Repeat(final Element e, boolean zeroOkay, boolean manyOkay) { this(e, zeroOkay, manyOkay, null); }
- private Repeat(final Element e, boolean zeroOkay, boolean manyOkay, Element separator) { this(e, zeroOkay, manyOkay, separator, false); }
- private Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal) {
+ 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(many1(e, separator)));
+ 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 }));
+ add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
if (separator==null)
- add(new Sequence.Unwrap(new Element[] { e, Repeat.this }));
+ add(new Sequence.Unwrap(new Element[] { e, Repeat.this }, tag));
else
- add(new Sequence.Unwrap(new Element[] { e, separator, Repeat.this }, new boolean[] { false, true, false }));
+ add(new Sequence.Unwrap(new Element[] { e, separator, Repeat.this }, tag, new boolean[] { false, true, false }));
+ }
+ }
+
+ 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));
}
- if (maximal) for(Sequence s : this) s.noFollow = separator==null ? e : separator;
}
+
}