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=c68120e8c6a63988a98986b5a9a041d6c1a73505;hp=4267b367dfa1616764475fd9286da03fcaef17ef;hb=b366a301b090a285c372f4fd77ab7472440f7d30;hpb=84a1ead27f09fa06c51e1ec5d63fb22305e50f87

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 4267b36..c68120e 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -11,26 +11,34 @@ import java.lang.ref.*;
 public class Repeat extends Union {
 
     /** repeat zero or one times */
-    public  static Repeat maybe(Element e)              { return new Repeat(e, true, false); }
+    public  static Repeat maybe(Element e)              { return new Repeat(e, true, false, null, false); }
+    public  static Repeat maybe(Element e, Object tag)              { return new Repeat(e, true, false, null, false, tag); }
     /** repeat zero or more times */
-    public  static Repeat many0(Element e)              { return new Repeat(e, true, true); }
+    public  static Repeat many0(Element e)              { return new Repeat(e, true, true, null, false); }
+    public  static Repeat many0(Element e, Object tag)              { return new Repeat(e, true, true, null, false, 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); }
+    public  static Repeat many0(Element e, Element sep) { return new Repeat(e, true, true, sep, false); }
+    public  static Repeat many0(Element e, Element sep, Object tag) { return new Repeat(e, true, true, sep, false, tag); }
     /** repeat one or more times */
-    public  static Repeat many1(Element e)              { return new Repeat(e, false, true); }
+    public  static Repeat many1(Element e)              { return new Repeat(e, false, true, null, false); }
+    public  static Repeat many1(Element e, Object tag)              { return new Repeat(e, false, true, null, false, 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); }
+    public  static Repeat many1(Element e, Element sep) { return new Repeat(e, false, true, sep, false); }
+    public  static Repeat many1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, false, tag); }
 
     /** 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); }
+    public  static Repeat maximal0(Element e, Object tag)              { return new Repeat(e, true, true, null, true, tag); }
     /** 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); }
+    public  static Repeat maximal1(Element e, Object tag)              { return new Repeat(e, false, true, null, true, tag); }
     /** repeat one or more times, separated by an atom <tt>sep</tt>, matching a maximal sequence */
     public  static Repeat maximal1(Element e, Element sep) { return new Repeat(e, false, true, sep, true); }
+    public  static Repeat maximal1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, true, tag); }
 
-    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) {
+        this(e, zeroOkay, manyOkay, separator, maximal, null); }
+    private Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal, Object tag) {
         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);
@@ -39,11 +47,11 @@ public class Repeat extends Union {
             if (manyOkay) add(new Sequence.Singleton(many1(e, separator)));
             else          add(new Sequence.Singleton(e));
         } else {
-            add(new Sequence.RewritingSequence(null, new Element[] { e }, null));
+            add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
             if (separator==null)
-                add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }));
+                add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }, tag));
             else
-                add(new Sequence.Unwrap(new Element[] { e, separator,      Repeat.this }, new boolean[] { false, true, false }));
+                add(new Sequence.Unwrap(new Element[] { e, separator,      Repeat.this }, tag, new boolean[] { false, true, false }));
         }
         if (maximal) for(Sequence s : this) s.noFollow = separator==null ? e : separator;
     }