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

1 files changed, 5 insertions, 9 deletions

diff --git a/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java b/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
index 3972e7a..198b0db 100755
--- a/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
@@ -23,16 +23,12 @@ public class ExpVariableCaseElement extends VariableCaseElement {
 		if(rl != null) {
 			RGrammar destGrammar = rl.belongsTo;
 			newState.swapGrammar(destGrammar);
-			String res = destGrammar.generate(varDef, state);
-
-			/*
-			 * @NOTE
-			 *
-			 * :Postprocessing
-			 *
-			 * This is because generate() returns a processed
-			 * string, but modifies the passed in StringBuilder.
+			/* 
+			 * Don't post-process the string, we should only do that
+			 * once.
 			 */
+			String res = destGrammar.generate(varDef, state, false);
+
 			newState.contents = new StringBuilder(res);
 		} else {
 			String msg = String.format("No rule '%s' defined", varDef);