diff options
Diffstat (limited to 'src/main')
12 files changed, 14 insertions, 81 deletions
diff --git a/src/main/java/bjc/rgens/parser/ConfigLoader.java b/src/main/java/bjc/rgens/parser/ConfigLoader.java index ee3476b..7af392f 100644 --- a/src/main/java/bjc/rgens/parser/ConfigLoader.java +++ b/src/main/java/bjc/rgens/parser/ConfigLoader.java @@ -1,15 +1,9 @@ package bjc.rgens.parser; -import static bjc.rgens.parser.RGrammarLogging.error; -import static bjc.rgens.parser.RGrammarLogging.info; -import static bjc.rgens.parser.RGrammarLogging.perf; - import bjc.utils.data.ITree; import bjc.utils.data.QueuedIterator; import bjc.utils.data.Tree; -import bjc.utils.funcutils.FileUtils; -import bjc.utils.funcutils.IteratorUtils; import bjc.utils.funcutils.StringUtils; import java.io.File; @@ -24,8 +18,6 @@ import java.nio.file.Paths; import java.util.Scanner; import bjc.rgens.parser.templates.GrammarTemplate; -import bjc.utils.funcutils.FileUtils; -import bjc.utils.ioutils.LevelSplitter; /* * @TODO @CLEANUP Ben Culkin 7/21/2019 :LoadingInfo @@ -428,7 +420,7 @@ public class ConfigLoader { actName = name; } - String fmt = String.format("INFO: Naming unnamed grammar off config name '%s'", actName); + //String fmt = String.format("INFO: Naming unnamed grammar off config name '%s'", actName); gram.name = actName; } @@ -483,6 +475,7 @@ public class ConfigLoader { try { /* Load grammar file. */ + @SuppressWarnings("unused") long startFileTime = System.nanoTime(); Reader rdr = new FileReader(convPath.toFile()); diff --git a/src/main/java/bjc/rgens/parser/FlatRuleCase.java b/src/main/java/bjc/rgens/parser/FlatRuleCase.java index 18559a1..5055810 100644 --- a/src/main/java/bjc/rgens/parser/FlatRuleCase.java +++ b/src/main/java/bjc/rgens/parser/FlatRuleCase.java @@ -1,7 +1,6 @@ package bjc.rgens.parser; import bjc.rgens.parser.elements.CaseElement; -import bjc.utils.funcdata.IList; import java.util.List; diff --git a/src/main/java/bjc/rgens/parser/GenerationState.java b/src/main/java/bjc/rgens/parser/GenerationState.java index 7a7adb9..49e7ba7 100644 --- a/src/main/java/bjc/rgens/parser/GenerationState.java +++ b/src/main/java/bjc/rgens/parser/GenerationState.java @@ -11,7 +11,6 @@ import java.util.Random; import bjc.utils.esodata.MapSet; import bjc.utils.ioutils.ReportWriter; -import static bjc.rgens.parser.RGrammarLogging.*; /** * The current state during generation. * diff --git a/src/main/java/bjc/rgens/parser/NormalRuleCase.java b/src/main/java/bjc/rgens/parser/NormalRuleCase.java index 95926c0..705a118 100644 --- a/src/main/java/bjc/rgens/parser/NormalRuleCase.java +++ b/src/main/java/bjc/rgens/parser/NormalRuleCase.java @@ -3,7 +3,6 @@ package bjc.rgens.parser; import java.util.List; import bjc.rgens.parser.elements.CaseElement; -import bjc.utils.funcdata.IList; /** * A rule case that inserts spaces in between elements, where appropriate. diff --git a/src/main/java/bjc/rgens/parser/RGrammar.java b/src/main/java/bjc/rgens/parser/RGrammar.java index cca7c01..d470dbd 100755 --- a/src/main/java/bjc/rgens/parser/RGrammar.java +++ b/src/main/java/bjc/rgens/parser/RGrammar.java @@ -4,9 +4,7 @@ import static bjc.utils.data.IPair.pair; import bjc.utils.data.IPair; import bjc.utils.data.ITree; -import bjc.utils.data.Pair; import bjc.utils.data.Tree; -import bjc.utils.funcutils.StringUtils; import bjc.utils.ioutils.ReportWriter; import bjc.rgens.parser.elements.*; @@ -23,8 +21,6 @@ import java.util.Set; import org.apache.commons.text.similarity.LevenshteinDistance; -import bjc.utils.data.IPair; -import bjc.utils.ioutils.ReportWriter; import edu.gatech.gtri.bktree.BkTreeSearcher; import edu.gatech.gtri.bktree.Metric; import edu.gatech.gtri.bktree.MutableBkTree; diff --git a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java index 7296801..45569a5 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java +++ b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java @@ -1,7 +1,5 @@ package bjc.rgens.parser; -import static bjc.rgens.parser.RGrammarLogging.trace; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/bjc/rgens/parser/RGrammarParser.java b/src/main/java/bjc/rgens/parser/RGrammarParser.java index 4a6ba8d..8ae7e5b 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarParser.java +++ b/src/main/java/bjc/rgens/parser/RGrammarParser.java @@ -1,53 +1,23 @@ package bjc.rgens.parser; -import static bjc.rgens.parser.RGrammarLogging.warn; - -import bjc.rgens.parser.elements.*; - -import bjc.utils.data.IPair; -import bjc.utils.data.ITree; -import bjc.utils.data.Pair; -import bjc.utils.data.Tree; - -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; - -import bjc.utils.funcutils.ListUtils; -import bjc.utils.funcutils.SetUtils; -import bjc.utils.funcutils.StringUtils; -import bjc.utils.funcutils.TriConsumer; - -import bjc.utils.ioutils.LevelSplitter; -import bjc.utils.ioutils.blocks.Block; -import bjc.utils.ioutils.blocks.BlockReader; -import bjc.utils.ioutils.blocks.SimpleBlockReader; - import java.io.IOException; import java.io.Reader; import java.io.StringReader; - -import java.util.Arrays; import java.util.ArrayList; import java.util.List; -import java.util.LinkedList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import bjc.rgens.parser.RGrammarBuilder.AffixType; - -import bjc.utils.data.Pair; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; -import bjc.utils.funcutils.TriConsumer; -import bjc.utils.ioutils.LevelSplitter; +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.utils.funcutils.StringUtils; import bjc.utils.ioutils.blocks.Block; import bjc.utils.ioutils.blocks.BlockReader; import bjc.utils.ioutils.blocks.SimpleBlockReader; -import static bjc.rgens.parser.RGrammarLogging.*; -import static bjc.rgens.parser.RGrammarBuilder.AffixType; - /** * Reads {@link RGrammar} from a input stream. * @@ -649,7 +619,7 @@ public class RGrammarParser { String ctxDelim = String.format(TMPL_TOPLEVEL_BLOCK_DELIM, level + 1); try (BlockReader bodyReader = new SimpleBlockReader(ctxDelim, ctxReader)) { - @SuppressWarnings("unused") + //@SuppressWarnings("unused") Block whereBody = whereReader.next(); whereBody.lineOffset = lineOffset + whereCtx.startLine; @@ -665,7 +635,7 @@ public class RGrammarParser { */ } } catch (IOException ioex) { - String msg = String.format("Unknown error in where block (%s)", ioex.getMessage()); + //String msg = String.format("Unknown error in where block (%s)", ioex.getMessage()); } } diff --git a/src/main/java/bjc/rgens/parser/RegexRuleCase.java b/src/main/java/bjc/rgens/parser/RegexRuleCase.java index 4d42ed6..ef358cb 100755 --- a/src/main/java/bjc/rgens/parser/RegexRuleCase.java +++ b/src/main/java/bjc/rgens/parser/RegexRuleCase.java @@ -3,8 +3,6 @@ package bjc.rgens.parser; import bjc.rgens.parser.elements.CaseElement; import java.util.List; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; /* * @TODO diff --git a/src/main/java/bjc/rgens/parser/Rule.java b/src/main/java/bjc/rgens/parser/Rule.java index 15e9b5f..1c002ad 100755 --- a/src/main/java/bjc/rgens/parser/Rule.java +++ b/src/main/java/bjc/rgens/parser/Rule.java @@ -6,7 +6,6 @@ import static bjc.utils.data.IPair.pair; import bjc.utils.data.IPair; import bjc.utils.data.ITree; import bjc.utils.data.Tree; -import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; import bjc.utils.gen.WeightedRandom; @@ -16,10 +15,6 @@ import java.util.Random; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import bjc.utils.data.IPair; -import bjc.utils.funcdata.IList; -import bjc.utils.gen.WeightedRandom; - /** * A rule in a randomized grammar. * @@ -134,7 +129,7 @@ public class Rule { try { Pattern.compile(reject); } catch (PatternSyntaxException psex) { - String msg = String.format("ERROR: '%s' is not a valid regex for rejection (%s)", reject, psex.getMessage()); + // String msg = String.format("ERROR: '%s' is not a valid regex for rejection (%s)", reject, psex.getMessage()); } rejectionPreds.add(reject); diff --git a/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java index 9385ded..9bcbba6 100644 --- a/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java @@ -3,14 +3,9 @@ package bjc.rgens.parser.elements; import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.RGrammarParser; -import bjc.utils.data.IPair; -import bjc.utils.funcdata.IList; - import bjc.utils.data.ITree; import bjc.utils.data.Tree; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcutils.StringUtils; import bjc.utils.gen.WeightedRandom; import bjc.utils.ioutils.LevelSplitter; diff --git a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java index ef0bf3a..9813e94 100644 --- a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java +++ b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java @@ -2,7 +2,6 @@ package bjc.rgens.parser.templates; import bjc.rgens.parser.ConfigSet; import bjc.rgens.parser.GenerationState; -import bjc.rgens.parser.LoadOptions; import bjc.utils.data.ITree; import bjc.utils.data.Tree; @@ -11,10 +10,6 @@ import java.io.Reader; import java.util.ArrayList; import java.util.List; import java.util.Scanner; - -import bjc.rgens.parser.ConfigSet; -import bjc.rgens.parser.GenerationState; - /** * Represents a grammar template. * diff --git a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java index 81c0c47..a1373f7 100644 --- a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java +++ b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java @@ -8,16 +8,11 @@ import java.util.regex.Pattern; import bjc.utils.data.BooleanToggle; import bjc.utils.data.ITree; -import bjc.utils.data.Tree; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.RGrammarParser; import bjc.rgens.parser.elements.CaseElement; import bjc.rgens.parser.elements.LiteralCaseElement; -import bjc.utils.data.BooleanToggle; -import bjc.utils.funcdata.FunctionalList; /** * A template element that can contain rule elements. @@ -56,7 +51,8 @@ public class LiveTemplateElement extends TemplateElement { List<CaseElement> elms = new ArrayList<>(); - int weight = RGrammarParser.parseElementString(body, elms, errs); + // This mutates elms. Not great design, but passable + RGrammarParser.parseElementString(body, elms, errs); elements.add(Arrays.asList(new LiteralCaseElement(sb.toString()))); elements.add(elms); |