Refactor to split RuleCaseElement

The various types of RuleCaseElement are now their own things.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/src/main/java/bjc/rgens/parser/elements/CaseElement.java
index 522de7a..cc04781 100755
--- a/src/main/java/bjc/rgens/parser/elements/CaseElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/CaseElement.java
@@ -131,7 +131,15 @@ public abstract class CaseElement {
 			 * Once the rule element execution has been refactored,
 			 * pass rawCase instead.
 			 */
-			return new RuleCaseElement(csepart);
+			if(csepart.contains("$")) {
+				if(csepart.contains("-")) {
+					return new DependantRuleReference(csepart);
+				}
+
+				return new VariableRuleReference(csepart);
+			}
+
+			return new NormalRuleReference(csepart);
 		} else {
 			return new LiteralCaseElement(csepart);
 		}