From d2559f2903cbd048ece9abfb7828d7ca10187812 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 28 May 2006 04:00:34 -0400 Subject: [PATCH] checkpoint darcs-hash:20060528080034-5007d-d441a0664996df1b4fc9a13ff5f2325d7754cb63.gz --- src/edu/berkeley/sbp/Repeat.java | 15 +++++++++------ src/edu/berkeley/sbp/Sequence.java | 8 ++++---- src/edu/berkeley/sbp/misc/MetaGrammar.java | 8 +++++--- src/edu/berkeley/sbp/misc/MetaGrammarTree.java | 4 ++++ 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java index c4e9486..ae2a77b 100644 --- a/src/edu/berkeley/sbp/Repeat.java +++ b/src/edu/berkeley/sbp/Repeat.java @@ -15,8 +15,6 @@ import java.lang.ref.*; } protected 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); if (zeroOkay) { add(new Sequence.Constant.Empty()); if (manyOkay) add(new Sequence.Singleton(Sequence.many1(e, separator))); @@ -28,15 +26,20 @@ import java.lang.ref.*; else add(new Sequence.Unwrap(new Element[] { e, separator, Repeat.this }, tag, new boolean[] { false, true, false })); } - // 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)); } public static class Maximal extends Repeat { public Maximal(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, Object tag) { super(e, zeroOkay, manyOkay, separator, true, tag); + if (zeroOkay && separator != null) + throw new RuntimeException("cannot create a maximal repetition of zero or more items with a separator (yet): " + this); + for(Sequence s : this) + s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(separator)); + } + public Maximal(final Element e, boolean zeroOkay, boolean manyOkay, Object tag) { + super(e, zeroOkay, manyOkay, null, true, tag); + for(Sequence s : this) + s.follow = new edu.berkeley.sbp.misc.MetaGrammar.Invert(new edu.berkeley.sbp.misc.MetaGrammar.Infer(e)); } } diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java index 34d7142..70b6b57 100644 --- a/src/edu/berkeley/sbp/Sequence.java +++ b/src/edu/berkeley/sbp/Sequence.java @@ -271,11 +271,11 @@ public abstract class Sequence extends Element implements Iterable { public static Repeat 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(Element e) { return new Repeat.Maximal(e, true, true, null, null); } - public static Repeat maximal0(Element e, Object tag) { return new Repeat.Maximal(e, true, true, null, tag); } + public static Repeat maximal0(Element e) { return new Repeat.Maximal(e, true, true, null); } + public static Repeat maximal0(Element 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(Element e) { return new Repeat.Maximal(e, false, true, null, null); } - public static Repeat maximal1(Element e, Object tag) { return new Repeat.Maximal(e, false, true, null, tag); } + public static Repeat maximal1(Element e) { return new Repeat.Maximal(e, false, true, null); } + public static Repeat maximal1(Element e, Object tag) { return new Repeat.Maximal(e, false, true, tag); } /** repeat one or more times, separated by an atom sep, matching a maximal sequence */ public static Repeat maximal1(Element e, Element sep) { return new Repeat.Maximal(e, false, true, sep, null); } public static Repeat maximal1(Element e, Element sep, Object tag) { return new Repeat.Maximal(e, false, true, sep, tag); } diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index f1c7075..3f2ffc7 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -302,9 +302,11 @@ public class MetaGrammar extends StringWalker { public MetaClause element, separator; public boolean maximal, zero, many; public Element build(BuildContext bc) { - return maximal - ? new Repeat.Maximal(element.build(bc), zero, many, separator==null?null:separator.build(bc), null) - : new Repeat(element.build(bc), zero, many, separator==null?null:separator.build(bc), null); + return !maximal + ? new Repeat(element.build(bc), zero, many, separator==null?null:separator.build(bc), null) + : separator==null + ? new Repeat.Maximal(element.build(bc), zero, many, null) + : new Repeat.Maximal(element.build(bc), zero, many, separator.build(bc), null); } public MetaRepeat(MetaClause element, boolean maximal, MetaClause separator, boolean zero, boolean many) { this.separator = separator; diff --git a/src/edu/berkeley/sbp/misc/MetaGrammarTree.java b/src/edu/berkeley/sbp/misc/MetaGrammarTree.java index 596e71e..a6f88b0 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammarTree.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammarTree.java @@ -39,6 +39,8 @@ public class MetaGrammarTree { + + // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED new edu.berkeley.sbp.Tree(null, "grammar", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, null, new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "=", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, null, new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "G", new edu.berkeley.sbp.Tree[] { }), new edu.berkeley.sbp.Tree(null, "r", new edu.berkeley.sbp.Tree[] { }), @@ -554,3 +556,5 @@ new edu.berkeley.sbp.Tree(null, "grammar", new edu.berkeley.sbp.Tree[] { new edu + + -- 1.7.10.4