diff options
Diffstat (limited to 'src/main')
19 files changed, 68 insertions, 65 deletions
diff --git a/src/main/java/bjc/rgens/ZadronsPouch.java b/src/main/java/bjc/rgens/ZadronsPouch.java index 827d022..d274b18 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.utils.funcdata.FunctionalList; 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 980a878..c1b5147 100644 --- a/src/main/java/bjc/rgens/parser/ConfigLoader.java +++ b/src/main/java/bjc/rgens/parser/ConfigLoader.java @@ -1,7 +1,8 @@ package bjc.rgens.parser; -import bjc.utils.funcutils.FileUtils; -import bjc.utils.ioutils.LevelSplitter; +import static bjc.rgens.parser.RGrammarLogging.error; +import static bjc.rgens.parser.RGrammarLogging.info; +import static bjc.rgens.parser.RGrammarLogging.perf; import java.io.BufferedReader; import java.io.IOException; @@ -11,8 +12,8 @@ import java.nio.file.Paths; import java.util.Scanner; import bjc.rgens.parser.templates.GrammarTemplate; - -import static bjc.rgens.parser.RGrammarLogging.*; +import bjc.utils.funcutils.FileUtils; +import bjc.utils.ioutils.LevelSplitter; public class ConfigLoader { /** diff --git a/src/main/java/bjc/rgens/parser/FlatRuleCase.java b/src/main/java/bjc/rgens/parser/FlatRuleCase.java index 4bbd1cc..17b037e 100644 --- a/src/main/java/bjc/rgens/parser/FlatRuleCase.java +++ b/src/main/java/bjc/rgens/parser/FlatRuleCase.java @@ -1,8 +1,7 @@ package bjc.rgens.parser; -import bjc.utils.funcdata.IList; - import bjc.rgens.parser.elements.CaseElement; +import bjc.utils.funcdata.IList; public class FlatRuleCase extends RuleCase { public FlatRuleCase(IList<CaseElement> elms) { diff --git a/src/main/java/bjc/rgens/parser/GenerationState.java b/src/main/java/bjc/rgens/parser/GenerationState.java index 3a6f827..ad2282c 100644 --- a/src/main/java/bjc/rgens/parser/GenerationState.java +++ b/src/main/java/bjc/rgens/parser/GenerationState.java @@ -1,16 +1,15 @@ package bjc.rgens.parser; -import bjc.utils.esodata.MapSet; -import bjc.utils.ioutils.ReportWriter; +import static bjc.rgens.parser.RGrammarLogging.warn; import java.io.IOException; import java.io.StringWriter; - import java.util.HashMap; import java.util.Map; import java.util.Random; -import static bjc.rgens.parser.RGrammarLogging.*; +import bjc.utils.esodata.MapSet; +import bjc.utils.ioutils.ReportWriter; /* * 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 7fee169..965c126 100644 --- a/src/main/java/bjc/rgens/parser/NormalRuleCase.java +++ b/src/main/java/bjc/rgens/parser/NormalRuleCase.java @@ -1,8 +1,7 @@ package bjc.rgens.parser; -import bjc.utils.funcdata.IList; - import bjc.rgens.parser.elements.CaseElement; +import bjc.utils.funcdata.IList; public class NormalRuleCase extends RuleCase { public NormalRuleCase(IList<CaseElement> elms) { diff --git a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java index 14b524f..70b738b 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarBuilder.java +++ b/src/main/java/bjc/rgens/parser/RGrammarBuilder.java @@ -1,22 +1,22 @@ package bjc.rgens.parser; -import bjc.rgens.parser.elements.CaseElement; -import bjc.utils.data.IPair; -import bjc.utils.data.Pair; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; -import bjc.utils.funcutils.ListUtils; -import bjc.utils.funcutils.SetUtils; +import static bjc.rgens.parser.RGrammarLogging.trace; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Set; -import static bjc.rgens.parser.RGrammarLogging.*; +import bjc.rgens.parser.elements.CaseElement; +import bjc.utils.data.IPair; +import bjc.utils.data.Pair; +import bjc.utils.funcdata.FunctionalList; +import bjc.utils.funcdata.IList; +import bjc.utils.funcutils.ListUtils; +import bjc.utils.funcutils.SetUtils; /** * Construct randomized grammars piece by piece. diff --git a/src/main/java/bjc/rgens/parser/RGrammarFormatter.java b/src/main/java/bjc/rgens/parser/RGrammarFormatter.java index b4cb00e..822dc43 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarFormatter.java +++ b/src/main/java/bjc/rgens/parser/RGrammarFormatter.java @@ -1,14 +1,13 @@ package bjc.rgens.parser; -import bjc.rgens.parser.elements.CaseElement; - -import bjc.utils.data.IPair; -import bjc.utils.funcdata.IList; - import java.util.HashSet; import java.util.Map; import java.util.Set; +import bjc.rgens.parser.elements.CaseElement; +import bjc.utils.data.IPair; +import bjc.utils.funcdata.IList; + /** * @TODO Ben Culkin 9/8/18 :GrammarFormatter * diff --git a/src/main/java/bjc/rgens/parser/RGrammarSet.java b/src/main/java/bjc/rgens/parser/RGrammarSet.java index 1ea61b1..f827e1f 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarSet.java +++ b/src/main/java/bjc/rgens/parser/RGrammarSet.java @@ -1,11 +1,12 @@ package bjc.rgens.parser; +import static bjc.rgens.parser.RGrammarLogging.debug; +import static bjc.rgens.parser.RGrammarLogging.warn; + import java.util.HashMap; import java.util.Map; import java.util.Set; -import static bjc.rgens.parser.RGrammarLogging.*; - /** * Represents a set of grammars that can share rules via exports. * diff --git a/src/main/java/bjc/rgens/parser/RGrammarTest.java b/src/main/java/bjc/rgens/parser/RGrammarTest.java index 788823a..1e335bf 100755 --- a/src/main/java/bjc/rgens/parser/RGrammarTest.java +++ b/src/main/java/bjc/rgens/parser/RGrammarTest.java @@ -1,6 +1,7 @@ package bjc.rgens.parser; -import bjc.rgens.parser.templates.GrammarTemplate; +import static bjc.rgens.parser.RGrammarLogging.error; +import static bjc.rgens.parser.RGrammarLogging.perf; import java.io.IOException; import java.net.URISyntaxException; @@ -9,7 +10,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Random; -import static bjc.rgens.parser.RGrammarLogging.*; +import bjc.rgens.parser.templates.GrammarTemplate; /** * Test for new grammar syntax. diff --git a/src/main/java/bjc/rgens/parser/RGrammars.java b/src/main/java/bjc/rgens/parser/RGrammars.java index cc31bad..9fe8dea 100755 --- a/src/main/java/bjc/rgens/parser/RGrammars.java +++ b/src/main/java/bjc/rgens/parser/RGrammars.java @@ -1,8 +1,8 @@ package bjc.rgens.parser; import java.io.IOException; -import java.net.URISyntaxException; import java.net.URI; +import java.net.URISyntaxException; import java.nio.file.FileSystem; import java.nio.file.FileSystems; import java.nio.file.Path; diff --git a/src/main/java/bjc/rgens/parser/Rule.java b/src/main/java/bjc/rgens/parser/Rule.java index a24bb1c..ee5543c 100755 --- a/src/main/java/bjc/rgens/parser/Rule.java +++ b/src/main/java/bjc/rgens/parser/Rule.java @@ -1,18 +1,17 @@ package bjc.rgens.parser; -import bjc.utils.data.IPair; -import bjc.utils.funcdata.IList; -import bjc.utils.gen.WeightedRandom; +import static bjc.rgens.parser.RGrammarLogging.fine; +import static bjc.utils.data.IPair.pair; import java.util.ArrayList; import java.util.List; import java.util.Random; - import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static bjc.rgens.parser.RGrammarLogging.*; -import static bjc.utils.data.IPair.pair; +import bjc.utils.data.IPair; +import bjc.utils.funcdata.IList; +import bjc.utils.gen.WeightedRandom; /** * A rule in a randomized grammar. diff --git a/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/src/main/java/bjc/rgens/parser/elements/CaseElement.java index 9c23ef2..f6f1611 100755 --- a/src/main/java/bjc/rgens/parser/elements/CaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/CaseElement.java @@ -1,12 +1,12 @@ package bjc.rgens.parser.elements; -import bjc.utils.ioutils.LevelSplitter; -import bjc.rgens.parser.GenerationState; -import bjc.rgens.parser.GrammarException; +import static bjc.rgens.parser.RGrammarLogging.trace; import java.util.Arrays; -import static bjc.rgens.parser.RGrammarLogging.*; +import bjc.rgens.parser.GenerationState; +import bjc.rgens.parser.GrammarException; +import bjc.utils.ioutils.LevelSplitter; /** * A element in a rule case. diff --git a/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java b/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java index 342d407..fac2d23 100644 --- a/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java @@ -1,12 +1,11 @@ package bjc.rgens.parser.elements; +import java.util.LinkedList; +import java.util.List; + import bjc.rgens.parser.GenerationState; -import bjc.rgens.parser.elements.CaseElement; import bjc.rgens.parser.elements.methods.MethodElement; -import java.util.List; -import java.util.LinkedList; - public class MethodCaseElement extends CaseElement { public CaseElement base; diff --git a/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java b/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java index d344162..923b56c 100644 --- a/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java @@ -1,9 +1,10 @@ package bjc.rgens.parser.elements; -import bjc.rgens.parser.GrammarException; +import static bjc.rgens.parser.RGrammarLogging.fine; + import bjc.rgens.parser.GenerationState; +import bjc.rgens.parser.GrammarException; import bjc.rgens.parser.Rule; -import static bjc.rgens.parser.RGrammarLogging.*; public class RuleVariableCaseElement extends VariableDefCaseElement { public final boolean exhaust; diff --git a/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java index 916ac3d..013f903 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java @@ -1,12 +1,12 @@ package bjc.rgens.parser.elements.vars; -import bjc.utils.ioutils.LevelSplitter; -import bjc.rgens.parser.GenerationState; -import bjc.rgens.parser.GrammarException; - import java.util.ArrayList; import java.util.List; +import bjc.rgens.parser.GenerationState; +import bjc.rgens.parser.GrammarException; +import bjc.utils.ioutils.LevelSplitter; + public abstract class VariableElement { public boolean forbidSpaces; diff --git a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java index a7c6cdc..aee9f7c 100644 --- a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java +++ b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java @@ -1,13 +1,13 @@ package bjc.rgens.parser.templates; -import bjc.rgens.parser.ConfigSet; -import bjc.rgens.parser.GenerationState; - 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; + public class GrammarTemplate { public ConfigSet belongsTo; diff --git a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java index 8dbde05..80c8315 100644 --- a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java +++ b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java @@ -1,18 +1,17 @@ package bjc.rgens.parser.templates; -import bjc.utils.data.BooleanToggle; -import bjc.utils.funcdata.FunctionalList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.RGrammarParser; import bjc.rgens.parser.elements.CaseElement; import bjc.rgens.parser.elements.LiteralCaseElement; - -import java.util.Arrays; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import bjc.utils.data.BooleanToggle; +import bjc.utils.funcdata.FunctionalList; public class LiveTemplateElement extends TemplateElement { private static final Pattern INSERT_PAT = Pattern.compile("\\$@(.+?)@\\$"); diff --git a/src/main/java/bjc/rgens/text/markov/Markov.java b/src/main/java/bjc/rgens/text/markov/Markov.java index e21d60f..c428dcb 100755 --- a/src/main/java/bjc/rgens/text/markov/Markov.java +++ b/src/main/java/bjc/rgens/text/markov/Markov.java @@ -1,7 +1,11 @@ package bjc.rgens.text.markov; +import java.util.ArrayList; +import java.util.Iterator; import java.util.Map.Entry; -import java.util.*; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; /** * Represents a k-character substring. diff --git a/src/main/java/bjc/rgens/text/markov/TextGenerator.java b/src/main/java/bjc/rgens/text/markov/TextGenerator.java index f629d49..47849f7 100755 --- a/src/main/java/bjc/rgens/text/markov/TextGenerator.java +++ b/src/main/java/bjc/rgens/text/markov/TextGenerator.java @@ -1,6 +1,8 @@ package bjc.rgens.text.markov; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; /** * Generate text from a markov model of an input text |