X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=48ac386b44d5a5e364e64995ab3d607468cbb877;hp=2365cbd2e579c69b7bdb236fa29a3f81b4d8cd6e;hb=87f214f3da9f43c3ab93923313845c372f9a96be;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4 diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java index 2365cbd..48ac386 100644 --- a/src/edu/berkeley/sbp/Repeat.java +++ b/src/edu/berkeley/sbp/Repeat.java @@ -30,7 +30,7 @@ public class Repeat extends Union { 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 ? "*" : "+")), true); + super(e+(!manyOkay ? "?" : (zeroOkay ? "*" : "+"))+(separator==null?"":("/"+separator.toString())), true); this.e = e; this.zeroOkay = zeroOkay; this.manyOkay = manyOkay; @@ -51,8 +51,12 @@ public class Repeat extends Union { 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; } + 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) {