diff options
Diffstat (limited to 'src/main/java/bjc')
14 files changed, 49 insertions, 35 deletions
diff --git a/src/main/java/bjc/rgens/ZadronsPouch.java b/src/main/java/bjc/rgens/ZadronsPouch.java index d274b18..0f5be70 100755 --- a/src/main/java/bjc/rgens/ZadronsPouch.java +++ b/src/main/java/bjc/rgens/ZadronsPouch.java @@ -1,8 +1,8 @@ package bjc.rgens; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.FunctionalStringTokenizer; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.FunctionalStringTokenizer; +import bjc.funcdata.IList; import bjc.utils.gen.RandomGrammar; /** diff --git a/src/main/java/bjc/rgens/parser/ConfigLoader.java b/src/main/java/bjc/rgens/parser/ConfigLoader.java index 7af392f..8daff71 100644 --- a/src/main/java/bjc/rgens/parser/ConfigLoader.java +++ b/src/main/java/bjc/rgens/parser/ConfigLoader.java @@ -1,8 +1,8 @@ package bjc.rgens.parser; -import bjc.utils.data.ITree; -import bjc.utils.data.QueuedIterator; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.QueuedIterator; +import bjc.data.Tree; import bjc.utils.funcutils.StringUtils; diff --git a/src/main/java/bjc/rgens/parser/GenerationState.java b/src/main/java/bjc/rgens/parser/GenerationState.java index 49e7ba7..3eab856 100644 --- a/src/main/java/bjc/rgens/parser/GenerationState.java +++ b/src/main/java/bjc/rgens/parser/GenerationState.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import bjc.utils.esodata.MapSet; +import bjc.esodata.MapSet; import bjc.utils.ioutils.ReportWriter; /** diff --git a/src/main/java/bjc/rgens/parser/RGrammar.java b/src/main/java/bjc/rgens/parser/RGrammar.java index d470dbd..4fe1d79 100755 --- a/src/main/java/bjc/rgens/parser/RGrammar.java +++ b/src/main/java/bjc/rgens/parser/RGrammar.java @@ -1,10 +1,10 @@ package bjc.rgens.parser; -import static bjc.utils.data.IPair.pair; +import static bjc.data.IPair.pair; -import bjc.utils.data.IPair; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.IPair; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.ioutils.ReportWriter; import bjc.rgens.parser.elements.*; diff --git a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java index 45569a5..820cf6b 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java +++ b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java @@ -9,13 +9,13 @@ import java.util.Map; import java.util.Set; import bjc.rgens.parser.elements.CaseElement; -import bjc.utils.data.IPair; -import bjc.utils.data.ITree; -import bjc.utils.data.Pair; -import bjc.utils.data.Tree; +import bjc.data.IPair; +import bjc.data.ITree; +import bjc.data.Pair; +import bjc.data.Tree; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.IList; import bjc.utils.funcutils.ListUtils; import bjc.utils.funcutils.SetUtils; @@ -125,6 +125,11 @@ public class RGrammarBuilder { * If the rule is either not valid or not defined in the grammar. */ public void setInitialRule(String init) { + ITree<String> errs = new Tree<>(); + + setInitialRule(init, errs); + + // FIXME do something if errs has a result. } public void setInitialRule(String init, ITree<String> errs) { diff --git a/src/main/java/bjc/rgens/parser/RGrammarFormatter.java b/src/main/java/bjc/rgens/parser/RGrammarFormatter.java index 822dc43..773e3a5 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarFormatter.java +++ b/src/main/java/bjc/rgens/parser/RGrammarFormatter.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.Set; import bjc.rgens.parser.elements.CaseElement; -import bjc.utils.data.IPair; -import bjc.utils.funcdata.IList; +import bjc.data.IPair; +import bjc.funcdata.IList; /** * @TODO Ben Culkin 9/8/18 :GrammarFormatter diff --git a/src/main/java/bjc/rgens/parser/RGrammarParser.java b/src/main/java/bjc/rgens/parser/RGrammarParser.java index 8ae7e5b..bfbdb98 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarParser.java +++ b/src/main/java/bjc/rgens/parser/RGrammarParser.java @@ -11,8 +11,8 @@ import bjc.rgens.parser.elements.CaseElement; import bjc.rgens.parser.elements.ChanceCaseElement; import bjc.rgens.parser.elements.SerialCaseElement; import bjc.rgens.parser.elements.VariableDefCaseElement; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.funcutils.StringUtils; import bjc.utils.ioutils.blocks.Block; import bjc.utils.ioutils.blocks.BlockReader; diff --git a/src/main/java/bjc/rgens/parser/RGrammarTest.java b/src/main/java/bjc/rgens/parser/RGrammarTest.java index 9559fd4..4ff3ceb 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarTest.java +++ b/src/main/java/bjc/rgens/parser/RGrammarTest.java @@ -3,8 +3,8 @@ package bjc.rgens.parser; import static bjc.rgens.parser.RGrammarLogging.error; import static bjc.rgens.parser.RGrammarLogging.perf; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import java.io.IOException; diff --git a/src/main/java/bjc/rgens/parser/Rule.java b/src/main/java/bjc/rgens/parser/Rule.java index 1c002ad..59240bb 100755 --- a/src/main/java/bjc/rgens/parser/Rule.java +++ b/src/main/java/bjc/rgens/parser/Rule.java @@ -1,12 +1,12 @@ package bjc.rgens.parser; import static bjc.rgens.parser.RGrammarLogging.fine; -import static bjc.utils.data.IPair.pair; +import static bjc.data.IPair.pair; -import bjc.utils.data.IPair; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; -import bjc.utils.funcdata.IList; +import bjc.data.IPair; +import bjc.data.ITree; +import bjc.data.Tree; +import bjc.funcdata.IList; import bjc.utils.gen.WeightedRandom; import java.util.ArrayList; diff --git a/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java index 9bcbba6..66fbb96 100644 --- a/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java @@ -4,8 +4,8 @@ import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.RGrammarParser; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.gen.WeightedRandom; import bjc.utils.ioutils.LevelSplitter; diff --git a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java index 1a04e50..8f12f58 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java @@ -8,14 +8,23 @@ import bjc.rgens.parser.Rule; * */ public class ARefVariableElement extends VariableElement { + /** + * The name of the value we are referring to. + */ public String value; + /** + * Create a new array reference. + * + * @param val The value of the array reference. + */ public ARefVariableElement(String val) { super(false); value = val; } + @Override public void generate(GenerationState state) { Rule rl = state.findRuleVar(value); diff --git a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java index 9813e94..45833f2 100644 --- a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java +++ b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java @@ -3,8 +3,8 @@ package bjc.rgens.parser.templates; import bjc.rgens.parser.ConfigSet; import bjc.rgens.parser.GenerationState; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import java.io.Reader; import java.util.ArrayList; diff --git a/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java index 2f0a571..6fa69f1 100644 --- a/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java +++ b/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java @@ -1,6 +1,6 @@ package bjc.rgens.parser.templates; -import bjc.utils.data.ITree; +import bjc.data.ITree; import bjc.rgens.parser.GenerationState; diff --git a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java index a1373f7..653ae76 100644 --- a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java +++ b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import bjc.utils.data.BooleanToggle; -import bjc.utils.data.ITree; +import bjc.data.BooleanToggle; +import bjc.data.ITree; import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.RGrammarParser; |