Refactoring

The main refactoring here is removing the type field from the various
classes, but there are a few other smaller ones.

This also contains the grounds for a refactoring on variable use

6 files changed, 216 insertions, 0 deletions

diff --git a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java
new file mode 100644
index 0000000..7a8910c
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java
@@ -0,0 +1,35 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+import bjc.rgens.parser.GrammarException;
+import bjc.rgens.parser.Rule;
+
+public class ARefVariableElement extends VariableElement {
+	public String value;
+
+	private boolean forbidSpaces;
+
+	public ARefVariableElement(boolean forbidSpaces, String val) {
+		value = val;
+	}
+	
+	public void generate(GenerationState state) {
+		if(!state.rlVars.containsKey(value)) {
+			throw new GrammarException("No rule variable named " + value);
+		}
+
+		Rule rl = state.rlVars.get(value);
+
+		GenerationState newState = state.newBuf();
+
+		rl.generate(newState);
+
+		String res = newState.contents.toString();
+
+		if(forbidSpaces && res.contains(" ")) {
+			throw new GrammarException("Spaces not allowed in this context (rule-var %s)");
+		}
+
+		state.contents.append(res);
+	}
+}
diff --git a/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java
new file mode 100644
index 0000000..080f849
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java
@@ -0,0 +1,15 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+
+public class LiteralVariableElement extends VariableElement {
+	public String val;
+
+	public LiteralVariableElement(String val) {
+		this.val = val;
+	}
+
+	public void generate(GenerationState state) {
+		state.contents.append(val);
+	}
+}
diff --git a/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java
new file mode 100644
index 0000000..6bf332f
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java
@@ -0,0 +1,35 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+import bjc.rgens.parser.GrammarException;
+import bjc.rgens.parser.Rule;
+
+public class RRefVariableElement extends VariableElement {
+	public String value;
+
+	private boolean forbidSpaces;
+
+	public RRefVariableElement(boolean forbidSpaces, String val) {
+		value = val;
+	}
+	
+	public void generate(GenerationState state) {
+		if(!state.rlVars.containsKey(value)) {
+			throw new GrammarException("No rule variable named " + value);
+		}
+
+		Rule rl = state.findRule(value, true);
+
+		GenerationState newState = state.newBuf();
+
+		rl.generate(newState);
+
+		String res = newState.contents.toString();
+
+		if(forbidSpaces && res.contains(" ")) {
+			throw new GrammarException("Spaces not allowed in this context (rule-reference %s)");
+		}
+
+		state.contents.append(res);
+	}
+}
diff --git a/src/main/java/bjc/rgens/parser/elements/vars/TRefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/TRefVariableElement.java
new file mode 100644
index 0000000..b10af87
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/TRefVariableElement.java
@@ -0,0 +1,43 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+import bjc.rgens.parser.GrammarException;
+import bjc.rgens.parser.templates.GrammarTemplate;
+
+/*
+ * @TODO
+ *
+ * finish when template vars are implemented.
+ */
+public class TRefVariableElement extends VariableElement {
+	/*
+	public String value;
+
+	private boolean forbidSpaces;
+
+	public TRefVariableElement(boolean forbidSpaces, String val) {
+		value = val;
+	}*/
+	
+	public void generate(GenerationState state) {
+		/*
+		if(!state.rlVars.containsKey(val)) {
+			throw new GrammarException("No rule variable named " + val);
+		}
+
+		Rule rl = state.rlVars.get(val);
+
+		GenerationState newState = state.newBuf();
+
+		rl.generate(newState);
+
+		String res = newState.contents.toString();
+
+		if(forbidSpaces && res.contains(" ")) {
+			throw new GrammarException("Spaces not allowed in this context (rule-var %s)");
+		}
+
+		return res;
+	*/
+	}
+}
diff --git a/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java
new file mode 100644
index 0000000..c6921ba
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java
@@ -0,0 +1,29 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+import bjc.rgens.parser.GrammarException;
+
+public class VRefVariableElement extends VariableElement {
+	public final String nam;
+
+	private final boolean forbidSpaces;
+
+	public VRefVariableElement(boolean forbidSpaces, String nam) {
+		this.nam = nam;
+
+		this.forbidSpaces = forbidSpaces;
+	}
+
+	public void generate(GenerationState state) {
+		if (!state.vars.containsKey(nam)) {
+			throw new GrammarException(String.format("No variable '%s' defined", nam));
+		}
+
+		String strang = state.vars.get(nam);
+		if(forbidSpaces && strang.contains(" ")) {
+			throw new GrammarException(String.format("Cannot include variable %s w/ spaces in body in rule name", nam));
+		}
+
+		state.contents.append(strang);
+	}
+}
diff --git a/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java
new file mode 100644
index 0000000..7a4260f
--- /dev/null
+++ b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java
@@ -0,0 +1,59 @@
+package bjc.rgens.parser.elements.vars;
+
+import bjc.rgens.parser.GenerationState;
+import bjc.rgens.parser.GrammarException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class VariableElement {
+	public abstract void generate(GenerationState state);
+
+	public static List<VariableElement> parseVariableElements(String varElm) {
+		boolean forbidSpaces = varElm.contains("-");
+
+		String[] parts;
+
+		if(forbidSpaces) {
+			parts = varElm.split("(?<=[+-])|(?=[+-])");
+		} else {
+			parts = new String[] { varElm };
+		}
+
+		return parseVariableElements(forbidSpaces, parts);
+	}
+
+	public static List<VariableElement> parseVariableElements(boolean forbidSpaces, String... parts) {
+		List<VariableElement> elms = new ArrayList<>(parts.length);
+
+		VariableElement prevElement = null;
+
+		for (String part : parts) {
+			VariableElement elm = null;
+
+			if(part.startsWith("$")) {
+				elm = new VRefVariableElement(forbidSpaces, part.substring(1));
+			} else if (part.startsWith("@")) {
+				elm = new ARefVariableElement(forbidSpaces, part.substring(1));
+			} else if (part.startsWith("%")) {
+				elm = new RRefVariableElement(forbidSpaces, part.substring(1));
+			} else if (part.startsWith("/")) {
+				throw new GrammarException("Template variables aren't implemented yet");
+			} else {
+				if(prevElement instanceof LiteralVariableElement) {
+					/* Aggregate chain literals together */
+					((LiteralVariableElement)prevElement).val += elm;
+				} else {
+					elm = new LiteralVariableElement(part);
+				}
+			}
+
+			if(elm != null) {
+				elms.add(elm);
+				prevElement = elm;
+			}
+		}
+
+		return elms;
+	}
+}