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=2dd39286674c447357796f446e76f14577fdb00a;hp=48681355013875d3dc697283edf7181b7c9ebf5e;hb=225993309e6183afa9a88fc13d39df56be54b992;hpb=eda544585c2304faa82d249c4744fd5cecbf9211 diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java index 4868135..2dd3928 100644 --- a/src/edu/berkeley/sbp/Repeat.java +++ b/src/edu/berkeley/sbp/Repeat.java @@ -8,9 +8,9 @@ import java.lang.reflect.*; import java.lang.ref.*; /** currently this class exports only static methods to create repetitions; there are no public instance methods or constructors */ -class Repeat extends Union { +/* FIXME make private again */ public class Repeat extends Union { - Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal) { + public Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal) { this(e, zeroOkay, manyOkay, separator, maximal, null); } 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); @@ -27,6 +27,9 @@ class Repeat extends Union { else 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; + // FIXME: hack! + if (maximal) + for(Sequence s : this) + s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(separator==null ? e : separator)); } }