X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=a75bafa008243da5b7f83fd045e8362002e1af5d;hp=e5e984f4e95b307c10b60b61e0c67e5aac07bab1;hb=6ae224025882c9929e2e4e9e8461decbf3b9cae4;hpb=c48a9498daf7604e41cf4aea7f6f7110388fd659

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index e5e984f..a75bafa 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -255,30 +255,37 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     // Repeat //////////////////////////////////////////////////////////////////////////////
 
     /** repeat zero or one times */
-    public  static Repeat maybe(Element e)                             { return new Repeat(e, true, false, null, null); }
-    public  static Repeat maybe(Element e, Object tag)                 { return new Repeat(e, true, false, null, tag); }
+    public  static Element maybe(Element e)                             { return new Repeat(e, true, false, null, null); }
+    public  static Element maybe(Element e, Object tag)                 { return new Repeat(e, true, false, null, tag); }
     /** repeat zero or more times */
-    public  static Repeat many0(Element e)                             { return new Repeat(e, true, true, null, null); }
-    public  static Repeat many0(Element e, Object tag)                 { return new Repeat(e, true, true, null, tag); }
+    public  static Element many0(Element e)                             { return new Repeat(e, true, true, null, null); }
+    public  static Element many0(Element e, Object tag)                 { return new Repeat(e, true, true, null, tag); }
     /** repeat zero or more times, separated by <tt>sep</tt> */
-    public  static Repeat many0(Element e, Element sep)                { return new Repeat(e, true, true, sep, null); }
-    public  static Repeat many0(Element e, Element sep, Object tag)    { return new Repeat(e, true, true, sep, tag); }
+    public  static Element many0(Element e, Element sep)                { return new Repeat(e, true, true, sep, null); }
+    public  static Element many0(Element e, Element sep, Object tag)    { return new Repeat(e, true, true, sep, tag); }
     /** repeat one or more times */
-    public  static Repeat many1(Element e)                             { return new Repeat(e, false, true, null, null); }
-    public  static Repeat many1(Element e, Object tag)                 { return new Repeat(e, false, true, null, tag); }
+    public  static Element many1(Element e)                             { return new Repeat(e, false, true, null, null); }
+    public  static Element many1(Element e, Object tag)                 { return new Repeat(e, false, true, null, tag); }
     /** repeat one or more times, separated by <tt>sep</tt> */
-    public  static Repeat many1(Element e, Element sep)                { return new Repeat(e, false, true, sep, null); }
-    public  static Repeat many1(Element e, Element sep, Object tag)    { return new Repeat(e, false, true, sep, tag); }
+    public  static Element many1(Element e, Element sep)                { return new Repeat(e, false, true, sep, null); }
+    public  static Element many1(Element e, Element sep, Object tag)    { return new Repeat(e, false, true, sep, tag); }
 
     /** repeat zero or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal0(Atom e)                             { return new Repeat.Maximal(e, true, true, null); }
-    public  static Repeat maximal0(Atom e, Object tag)                 { return new Repeat.Maximal(e, true, true, tag); }
+    public  static Element maximal0(Atom e)                             { return new Repeat.Maximal(e, true, true, null); }
+    public  static Element maximal0(Atom e, Object tag)                 { return new Repeat.Maximal(e, true, true, tag); }
     /** repeat one or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal1(Atom e)                             { return new Repeat.Maximal(e, false, true, null); }
-    public  static Repeat maximal1(Atom e, Object tag)                 { return new Repeat.Maximal(e, false, true, tag); }
+    public  static Element maximal1(Atom e)                             { return new Repeat.Maximal(e, false, true, null); }
+    public  static Element maximal1(Atom e, Object tag)                 { return new Repeat.Maximal(e, false, true, tag); }
     /** repeat one or more times, separated by an atom <tt>sep</tt>, matching a maximal sequence */
-    public  static Repeat maximal1(Element e, Atom sep)                { return new Repeat.Maximal(e, false, true, sep, null); }
-    public  static Repeat maximal1(Element e, Atom sep, Object tag)    { return new Repeat.Maximal(e, false, true, sep, tag); }
-
-
+    public  static Element maximal1(Element e, Atom sep)                { return new Repeat.Maximal(e, false, true, sep, null); }
+    public  static Element maximal1(Element e, Atom sep, Object tag)    { return new Repeat.Maximal(e, false, true, sep, tag); }
+
+    public  static Element repeatMaximal(Atom e, boolean zero, boolean many, Object tag) {
+        return new Repeat.Maximal(e, zero, many, tag); }
+    public  static Element repeatMaximal(Element e, boolean zero, boolean many, Atom sep, Object tag) {
+        return new Repeat.Maximal(e, zero, many, sep, tag); }
+    public  static Element repeat(Element e, boolean zero, boolean many, Object tag) {
+        return new Repeat(e, zero, many, tag); }
+    public  static Element repeat(Element e, boolean zero, boolean many, Element sep, Object tag) {
+        return new Repeat(e, zero, many, sep, tag); }
 }