X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=3e9b2b6c7fe8f949db881e8918ea94ad3246c584;hb=96a2822a729e563a64173f22dc184bc972a200ef;hp=35f34775726f3ddb151fbc72ff670769aa2999d5;hpb=77d1e5fd29be1ca529e71a4c011f5edea61588e8;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 35f3477..3e9b2b6 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -20,18 +20,27 @@ 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;
@@ -47,17 +56,6 @@ public class Repeat extends Union {
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 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));
- }
+ if (maximal) for(Sequence s : this) s.noFollow = separator==null ? e : separator;
}
}