X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=bc6626ab520f9037bbaf76e9564f35a8ac339a98;hp=48ac386b44d5a5e364e64995ab3d607468cbb877;hb=0516ea34996c86664928ef948013b749876b87ec;hpb=87f214f3da9f43c3ab93923313845c372f9a96be
diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 48ac386..bc6626a 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -20,48 +20,47 @@ 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); }
- public static Maximal maximal(Element e) { return new Maximal(e); }
+ /** 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 */
+ 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) {
+ 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(); }
+ });
+ }
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));
+ 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));
} else {
- add(new Sequence.RewritingSequence(null, new Element[] { e }, null, null));
+ who.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));
+ who.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));
+ who.add(new Sequence.Unwrap(new Element[] { e, this.separator, Repeat.this }, new boolean[] { false, true, false }, null, null));
}
}
}
-
- 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;
- }
- }
- static class Maximal extends Union {
- public Maximal(final Element e) {
- super(e+"+", true);
- add(new MaximalSequence(e));
- }
- }
}