From aea83f40c087ee32cbc1ad4e7940d53f887fbff8 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Sun, 3 Jun 2018 20:00:46 -0300 Subject: Add inline case elements This adds inline case elements, essentially cutting down on the need for short 2-3 alternative rules. You'll still need explicit rules for things involving spaces though. Perhaps I will add a quoting feature to solve that problem. --- .../bjc/rgens/parser/elements/CaseElement.java | 2 ++ .../parser/elements/InlineRuleCaseElement.java | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java (limited to 'src/main/java/bjc/rgens/parser/elements') diff --git a/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/src/main/java/bjc/rgens/parser/elements/CaseElement.java index 785ac1a..d7889a9 100755 --- a/src/main/java/bjc/rgens/parser/elements/CaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/CaseElement.java @@ -118,6 +118,8 @@ public abstract class CaseElement { } else if (specialBody.matches("empty")) { /* Literal blank, for empty cases. */ return new BlankCaseElement(); + } else if (specialBody.contains("|")) { + return new InlineRuleCaseElement(specialBody.split("|")); } else { throw new IllegalArgumentException(String.format("Unknown special case part '%s'", specialBody)); } diff --git a/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java new file mode 100644 index 0000000..95bb5f9 --- /dev/null +++ b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java @@ -0,0 +1,24 @@ +package bjc.rgens.parser.elements; + +import bjc.rgens.parser.GenerationState; + +import bjc.utils.funcdata.FunctionalList; +import bjc.utils.funcdata.IList; + +public class InlineRuleCaseElement extends CaseElement { + public final IList elements; + + public InlineRuleCaseElement(String... elements) { + this(new FunctionalList<>(elements).map(CaseElement::createElement)); + } + + public InlineRuleCaseElement(IList elements) { + super(ElementType.RULEREF); + + this.elements = elements; + } + + public void generate(GenerationState state) { + elements.randItem(state.rnd::nextInt).generate(state); + } +} -- cgit v1.2.3