summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath32
-rw-r--r--.project23
-rw-r--r--.settings/org.eclipse.core.resources.prefs4
-rw-r--r--.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--src/main/java/bjc/rgens/parser/ConfigLoader.java11
-rw-r--r--src/main/java/bjc/rgens/parser/FlatRuleCase.java1
-rw-r--r--src/main/java/bjc/rgens/parser/GenerationState.java1
-rw-r--r--src/main/java/bjc/rgens/parser/NormalRuleCase.java1
-rwxr-xr-xsrc/main/java/bjc/rgens/parser/RGrammar.java4
-rwxr-xr-xsrc/main/java/bjc/rgens/parser/RGrammarBuilder.java2
-rwxr-xr-xsrc/main/java/bjc/rgens/parser/RGrammarParser.java48
-rwxr-xr-xsrc/main/java/bjc/rgens/parser/RegexRuleCase.java2
-rwxr-xr-xsrc/main/java/bjc/rgens/parser/Rule.java7
-rw-r--r--src/main/java/bjc/rgens/parser/elements/InlineRuleCaseElement.java5
-rw-r--r--src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java5
-rw-r--r--src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java8
17 files changed, 85 insertions, 81 deletions
diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..2efb9ee
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="data">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000..28c0e93
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>RGens</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..382b70b
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
+encoding/data=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..2f5cc74
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
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);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 18:47:37 +0000