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, 1 insertions, 10 deletions

diff --git a/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java b/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
index a2c15a7..63701e0 100755
--- a/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
@@ -21,7 +21,7 @@ public abstract class VariableCaseElement extends CaseElement {
 	public final VariableType varType;
 
 	public VariableCaseElement(String name, String def, VariableType varType) {
-		super(ElementType.VARIABLE);
+		super(false);
 
 		varName = name;
 		varDef = def;
@@ -60,15 +60,6 @@ public abstract class VariableCaseElement extends CaseElement {
 		return true;
 	}
 
-	@Override
-	public String toString() {
-		if (type == ElementType.VARIABLE) {
-			return String.format("{$%s:=%s}", varName, varDef);
-		} else {
-			return String.format("{$%s=%s}", varName, varDef);
-		}
-	}
-
 	public static CaseElement parseVariable(String varName, String varDef, boolean colon) {
 		if(varName.startsWith("$")) {
 			// Handle normal/expanding variable definitions