X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=bd0dbe0a43764009bc064995d93ed9b1a7622551;hb=8ac1795e6098dcf10b94a854351162695181b83d;hp=bc6626ab520f9037bbaf76e9564f35a8ac339a98;hpb=0516ea34996c86664928ef948013b749876b87ec;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index bc6626a..bd0dbe0 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -20,47 +20,31 @@ public class Repeat extends Union {
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 sep, matching a maximal sequence of atoms */
+ /** 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); }
- // 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;
- Union who = this;
- if (maximal) {
- who = new Union(this+"++");
- add(new Sequence.Singleton(who, null, null) {
- public Topology noFollow() { return separator==null ? e.toAtom() : separator.toAtom(); }
- });
- }
+ 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) {
+ 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) {
- who.add(new Sequence.Constant.Empty());
- if (manyOkay) who.add(new Sequence.Singleton(many1(e, separator), null, null));
- else who.add(new Sequence.Singleton(e, null, null));
+ add(new Sequence.Constant.Empty());
+ if (manyOkay) add(new Sequence.Singleton(many1(e, separator)));
+ else add(new Sequence.Singleton(e));
} else {
- who.add(new Sequence.RewritingSequence(null, new Element[] { e }, null, null));
- if (this.separator==null) {
- who.add(new Sequence.Unwrap(new Element[] { e, Repeat.this }, null, null));
- } else {
- who.add(new Sequence.Unwrap(new Element[] { e, this.separator, Repeat.this }, new boolean[] { false, true, false }, null, null));
- }
+ add(new Sequence.RewritingSequence(null, new Element[] { e }));
+ if (separator==null)
+ add(new Sequence.Unwrap(new Element[] { e, Repeat.this }));
+ else
+ add(new Sequence.Unwrap(new Element[] { e, separator, Repeat.this }, new boolean[] { false, true, false }));
}
+ if (maximal) for(Sequence s : this) s.noFollow = separator==null ? e : separator;
}
}