Cleanup

8 files changed, 11 insertions, 59 deletions

diff --git a/src/main/java/bjc/rgens/parser/ConfigLoader.java b/src/main/java/bjc/rgens/parser/ConfigLoader.java
index c1b5147..67c1cf7 100644
--- a/src/main/java/bjc/rgens/parser/ConfigLoader.java
+++ b/src/main/java/bjc/rgens/parser/ConfigLoader.java
@@ -316,7 +316,7 @@ public class ConfigLoader {
 		} else {
 			/* Load grammar file. */
 			try {
-				long startFileTime = System.nanoTime();
+				//long startFileTime = System.nanoTime();
 
 				BufferedReader fis = Files.newBufferedReader(convPath);
 				doLoadGrammar(fis, name, cfgSet, set, convPath, path);
diff --git a/src/main/java/bjc/rgens/parser/RGrammar.java b/src/main/java/bjc/rgens/parser/RGrammar.java
index 1286d1b..a2410c8 100755
--- a/src/main/java/bjc/rgens/parser/RGrammar.java
+++ b/src/main/java/bjc/rgens/parser/RGrammar.java
@@ -37,6 +37,7 @@ public class RGrammar {
 	public boolean useBuiltinPostprocs = true;
 
 	/* The max distance between possible alternate rules. */
+	@SuppressWarnings("unused")
 	private static final int MAX_DISTANCE = 6;
 
 	/* The metric for the levenshtein distance. */
@@ -70,6 +71,7 @@ public class RGrammar {
 	public Map<String, CaseElement> autoRlVars;
 
 	/* The tree to use for finding rule suggestions. */
+	@SuppressWarnings("unused")
 	private BkTreeSearcher<String> ruleSearcher;
 
 	static {
diff --git a/src/main/java/bjc/rgens/parser/Rule.java b/src/main/java/bjc/rgens/parser/Rule.java
index ee5543c..90b14f9 100755
--- a/src/main/java/bjc/rgens/parser/Rule.java
+++ b/src/main/java/bjc/rgens/parser/Rule.java
@@ -60,6 +60,7 @@ public class Rule {
 
 	private int caseCount = 0;
 
+	@SuppressWarnings("unused")
 	private int serial;
 	private static int nextSerial = 0;
 
diff --git a/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/src/main/java/bjc/rgens/parser/elements/CaseElement.java
index f6f1611..6c3bd2e 100755
--- a/src/main/java/bjc/rgens/parser/elements/CaseElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/CaseElement.java
@@ -2,8 +2,6 @@ package bjc.rgens.parser.elements;
 
 import static bjc.rgens.parser.RGrammarLogging.trace;
 
-import java.util.Arrays;
-
 import bjc.rgens.parser.GenerationState;
 import bjc.rgens.parser.GrammarException;
 import bjc.utils.ioutils.LevelSplitter;
@@ -143,13 +141,6 @@ public abstract class CaseElement {
 
 				// String[] elms = LevelSplitter.def.levelSplit(rawCase, "|").toArray(new String[0]);
 				// return new InlineRuleCaseElement(elms);
-			} else if (LevelSplitter.def.levelContains(rawCase, ".")) {
-				String[] parts = LevelSplitter.def.levelSplit(rawCase, ".").toArray(new String[0]);
-
-				CaseElement base = createElement(parts[0]);
-
-				parts = Arrays.copyOfRange(parts, 1, parts.length);
-				return new MethodCaseElement(base, parts);
 			} else {
 				return new RuleCaseElement(rawCase);
 			}
diff --git a/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java b/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java
deleted file mode 100644
index fac2d23..0000000
--- a/src/main/java/bjc/rgens/parser/elements/MethodCaseElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package bjc.rgens.parser.elements;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import bjc.rgens.parser.GenerationState;
-import bjc.rgens.parser.elements.methods.MethodElement;
-
-public class MethodCaseElement extends CaseElement {
-	public CaseElement base;
-
-	public List<MethodElement> methods;
-
-	public MethodCaseElement(CaseElement base, String... rawMethods) {
-		this.base = base;
-
-		// @TODO
-		//
-		// Implement this
-	}
-
-	public MethodCaseElement(CaseElement base, List<MethodElement> rawMethods) {
-		this.base = base;
-
-		methods = new LinkedList<>();
-		
-		for(MethodElement method : rawMethods) {
-			methods.add(method);
-		}
-	}
-
-	public void generate(GenerationState state) {
-		base.generate(state);
-
-		for(MethodElement method : methods) {
-			method.call(state);
-		}
-	}
-}
diff --git a/src/main/java/bjc/rgens/parser/elements/methods/MethodElement.java b/src/main/java/bjc/rgens/parser/elements/methods/MethodElement.java
deleted file mode 100644
index 0e8f37c..0000000
--- a/src/main/java/bjc/rgens/parser/elements/methods/MethodElement.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package bjc.rgens.parser.elements.methods;
-
-import bjc.rgens.parser.GenerationState;
-
-public interface MethodElement {
-	public void call(GenerationState state);
-}
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 5df0f46..1a04e50 100644
--- a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java
@@ -2,7 +2,11 @@ package bjc.rgens.parser.elements.vars;
 
 import bjc.rgens.parser.GenerationState;
 import bjc.rgens.parser.Rule;
-
+/**
+ * Reference to an array variable.
+ * @author bjculkin
+ *
+ */
 public class ARefVariableElement extends VariableElement {
 	public String value;
 
diff --git a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
index aee9f7c..a57897c 100644
--- a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
+++ b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
@@ -37,10 +37,10 @@ public class GrammarTemplate {
 		Scanner scn = new Scanner(rdr);
 		scn.useDelimiter("\\R");
 
-		int lno = 0;
+		//int lno = 0;
 		while(scn.hasNextLine()) {
 			String ln = scn.nextLine();
-			lno += 1;
+			//lno += 1;
 
 			switch(ln.charAt(0)) {
 			case '#':