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, 6 insertions, 2 deletions

diff --git a/src/main/java/bjc/rgens/parser/NormalRuleCase.java b/src/main/java/bjc/rgens/parser/NormalRuleCase.java
index 19fa8af..c8891a2 100644
--- a/src/main/java/bjc/rgens/parser/NormalRuleCase.java
+++ b/src/main/java/bjc/rgens/parser/NormalRuleCase.java
@@ -6,7 +6,7 @@ import bjc.rgens.parser.elements.CaseElement;
 
 public class NormalRuleCase extends RuleCase {
 	public NormalRuleCase(IList<CaseElement> elms) {
-		super(CaseType.NORMAL, elms);
+		super(elms);
 	}
 
 	@Override
@@ -14,9 +14,13 @@ public class NormalRuleCase extends RuleCase {
 		for(CaseElement elm : elementList) {
 			elm.generate(state);
 
-			if(elm.type.spacing) {
+			if(elm.spacing) {
 				state.contents.append(" ");
 			}
 		}
 	}
+
+	public NormalRuleCase withElements(IList<CaseElement> elms) {
+		return new NormalRuleCase(elms);
+	}
 }