Templates pt. 3

Templates should now work, though there is no syntax to reference them
from rules yet

In addition, several internal things have been changed so as to improve
code quality

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java b/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
index 3e3d182..e0c847a 100755
--- a/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
+++ b/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
@@ -26,18 +26,18 @@ public abstract class RuleCaseElement extends StringCaseElement {
 	protected void doGenerate(String actName, GenerationState state) {
 		GenerationState newState = state.newBuf();
 
-		IPair<RGrammar, Rule> par;
+		Rule rl;
 
 		if (actName.startsWith("[^")) {
 			actName = "[" + actName.substring(2);
 
-			par = state.findImport(actName);
+			rl = state.findImport(actName);
 		} else {
-			par = state.findRule(actName, true);
+			rl = state.findRule(actName, true);
 		}
 
-		if(par != null) {
-			RGrammar destGrammar = par.getLeft();
+		if(rl != null) {
+			RGrammar destGrammar = rl.belongsTo;
 			newState.swapGrammar(destGrammar);
 			String res = destGrammar.generate(actName, newState);