WIP: more sophisticated backtracking of packrat parser (epatch grammar can be parsed now)

399 files changed, 17533 insertions, 1909 deletions

diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
index 4e4408f..da919f3 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
@@ -44,7 +44,15 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordType(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
index 9a32d42..1cddab9 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
@@ -55,7 +55,15 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -99,15 +107,40 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordErwachsener(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordLeftParenthesis(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -115,7 +148,16 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentAge());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -123,6 +165,14 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index aefec6f..048c195 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -73,7 +73,15 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -138,15 +146,40 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000000KeywordFamilie(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeKeyword$9(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$9(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000001KeywordLeftParenthesis(), null, false, false, getKeyword$9$Delimiter());
 	}
 
 	protected int consumeAssignment$10(int entryPoint) throws Exception {
-		return consumeAlternatives$11(entryPoint);
+		int result = doConsumeAssignment$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$10(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001AssignmentName());
+		return result.getResult(consumeAlternatives$11(entryPoint));
 	}
 	protected int consumeAlternatives$11(int entryPoint) throws Exception {
 		AlternativesResult result = createAlternativesResult();
@@ -186,7 +219,16 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$16(int entryPoint) throws Exception {
-		return consumeCrossReference$17(entryPoint);
+		int result = doConsumeAssignment$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$16(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentMutter());
+		return result.getResult(consumeCrossReference$17(entryPoint));
 	}
 
 	protected int consumeCrossReference$17(int entryPoint) throws Exception {
@@ -194,7 +236,16 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$19(int entryPoint) throws Exception {
-		return consumeCrossReference$20(entryPoint);
+		int result = doConsumeAssignment$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$19(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentVater());
+		return result.getResult(consumeCrossReference$20(entryPoint));
 	}
 
 	protected int consumeCrossReference$20(int entryPoint) throws Exception {
@@ -202,7 +253,16 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$22(int entryPoint) throws Exception {
-		return consumeCrossReference$23(entryPoint);
+		int result = doConsumeAssignment$22(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$22(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$22(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentKinder());
+		return result.getResult(consumeCrossReference$23(entryPoint));
 	}
 
 	protected int consumeCrossReference$23(int entryPoint) throws Exception {
@@ -220,7 +280,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$25(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -243,11 +303,28 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$26(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$26(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$26(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$26(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010KeywordComma(), null, false, false, getKeyword$26$Delimiter());
 	}
 
 	protected int consumeAssignment$27(int entryPoint) throws Exception {
-		return consumeCrossReference$28(entryPoint);
+		int result = doConsumeAssignment$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$27(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentKinder());
+		return result.getResult(consumeCrossReference$28(entryPoint));
 	}
 
 	protected int consumeCrossReference$28(int entryPoint) throws Exception {
@@ -255,6 +332,14 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$30(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$30(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$30(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$30(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$30$Delimiter());
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
index 4071f1d..c8fe424 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
@@ -48,7 +48,16 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeAlternatives$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentWert());
+		return result.getResult(consumeAlternatives$2(entryPoint));
 	}
 	protected int consumeAlternatives$2(int entryPoint) throws Exception {
 		AlternativesResult result = createAlternativesResult();
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
index 7c6b244..1a89dc8 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
@@ -55,7 +55,15 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -99,15 +107,40 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordKind(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordLeftParenthesis(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -115,7 +148,16 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentAge());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -123,6 +165,14 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
index 79a10ab..7627bba 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
@@ -40,7 +40,15 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(kindConsumer, null, false, false, false, getRule().ele0ParserRuleCallKind());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(erwachsenerConsumer, null, false, false, false, getRule().ele1ParserRuleCallErwachsener());
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
index 4bd1fb4..39a3771 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
@@ -76,7 +76,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int doConsumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -127,11 +127,28 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00000KeywordSpielplatz(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentGroesse());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -150,7 +167,8 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentBeschreibung());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -158,6 +176,14 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
@@ -172,7 +198,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int doConsumeAlternatives$12(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -206,7 +232,16 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$16(int entryPoint) throws Exception {
-		return consumeRuleCall$17(entryPoint);
+		int result = doConsumeAssignment$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$16(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010000AssignmentKinder());
+		return result.getResult(consumeRuleCall$17(entryPoint));
 	}
 
 	protected int consumeRuleCall$17(int entryPoint) throws Exception {
@@ -214,7 +249,16 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$18(int entryPoint) throws Exception {
-		return consumeRuleCall$19(entryPoint);
+		int result = doConsumeAssignment$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$18(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010001AssignmentErzieher());
+		return result.getResult(consumeRuleCall$19(entryPoint));
 	}
 
 	protected int consumeRuleCall$19(int entryPoint) throws Exception {
@@ -222,7 +266,16 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$20(int entryPoint) throws Exception {
-		return consumeRuleCall$21(entryPoint);
+		int result = doConsumeAssignment$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$20(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01001AssignmentSpielzeuge());
+		return result.getResult(consumeRuleCall$21(entryPoint));
 	}
 
 	protected int consumeRuleCall$21(int entryPoint) throws Exception {
@@ -230,7 +283,16 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$22(int entryPoint) throws Exception {
-		return consumeRuleCall$23(entryPoint);
+		int result = doConsumeAssignment$22(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$22(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$22(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0101AssignmentFamilie());
+		return result.getResult(consumeRuleCall$23(entryPoint));
 	}
 
 	protected int consumeRuleCall$23(int entryPoint) throws Exception {
@@ -238,7 +300,16 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$24(int entryPoint) throws Exception {
-		return consumeRuleCall$25(entryPoint);
+		int result = doConsumeAssignment$24(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$24(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$24(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentTypes());
+		return result.getResult(consumeRuleCall$25(entryPoint));
 	}
 
 	protected int consumeRuleCall$25(int entryPoint) throws Exception {
@@ -246,6 +317,14 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeKeyword$26(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$26(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$26(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$26(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$26$Delimiter());
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
index 4f9beb1..6501434 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
@@ -52,7 +52,15 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -96,15 +104,40 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordSpielzeug(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordLeftParenthesis(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -112,7 +145,16 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentFarbe());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -120,6 +162,14 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index d230bdf..5e04b9a 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -49,7 +49,15 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -86,11 +94,28 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordAttr(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -98,11 +123,28 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentType());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index df124f7..4000bac 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -44,7 +44,15 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordDatatype(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index c69140e..fc5d2ae 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -58,7 +58,15 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -109,11 +117,28 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00000KeywordEntity(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -132,7 +157,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$9(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -155,11 +180,28 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00010KeywordExtends(), null, false, false, getKeyword$10$Delimiter());
 	}
 
 	protected int consumeAssignment$11(int entryPoint) throws Exception {
-		return consumeCrossReference$12(entryPoint);
+		int result = doConsumeAssignment$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$11(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00011AssignmentSuperType());
+		return result.getResult(consumeCrossReference$12(entryPoint));
 	}
 
 	protected int consumeCrossReference$12(int entryPoint) throws Exception {
@@ -167,6 +209,14 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$14$Delimiter());
 	}
 
@@ -181,7 +231,8 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
-		return consumeRuleCall$16(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentFeatures());
+		return result.getResult(consumeRuleCall$16(entryPoint));
 	}
 
 	protected int consumeRuleCall$16(int entryPoint) throws Exception {
@@ -189,6 +240,14 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$17$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
index 26db5b7..6d8fc40 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(structuralFeatureConsumer, null, false, false, false, getRule().ele0ParserRuleCallStructuralFeature());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(operationConsumer, null, false, false, false, getRule().ele1ParserRuleCallOperation());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
index dad5a39..6636fa9 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,7 +81,8 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentImports());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -91,7 +100,8 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentNamedElements());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
index d0f37cd..0ab1f97 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
@@ -44,7 +44,15 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordImport(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentImportURI());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
index a8b9293..5761350 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(packageConsumer, null, false, false, false, getRule().ele0ParserRuleCallPackage());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(typeConsumer, null, false, false, false, getRule().ele1ParserRuleCallType());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
index a7f260c..fd09c8b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
@@ -60,7 +60,15 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -118,11 +126,28 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000KeywordOp(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001AssignmentName());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -130,6 +155,14 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordLeftParenthesis(), null, false, false, getKeyword$10$Delimiter());
 	}
 
@@ -145,7 +178,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$11(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -168,7 +201,16 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$12(int entryPoint) throws Exception {
-		return consumeRuleCall$13(entryPoint);
+		int result = doConsumeAssignment$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00010AssignmentParams());
+		return result.getResult(consumeRuleCall$13(entryPoint));
 	}
 
 	protected int consumeRuleCall$13(int entryPoint) throws Exception {
@@ -186,7 +228,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$14(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00011Group());
+		final GroupResult result = createGroupResult(getRule().ele00011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -209,11 +251,28 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$15(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$15(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000110KeywordComma(), null, false, false, getKeyword$15$Delimiter());
 	}
 
 	protected int consumeAssignment$16(int entryPoint) throws Exception {
-		return consumeRuleCall$17(entryPoint);
+		int result = doConsumeAssignment$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$16(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000111AssignmentParams());
+		return result.getResult(consumeRuleCall$17(entryPoint));
 	}
 
 	protected int consumeRuleCall$17(int entryPoint) throws Exception {
@@ -221,15 +280,40 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$18(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordRightParenthesis(), null, false, false, getKeyword$18$Delimiter());
 	}
 
 	protected int consumeKeyword$19(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$19(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, getKeyword$19$Delimiter());
 	}
 
 	protected int consumeAssignment$20(int entryPoint) throws Exception {
-		return consumeRuleCall$21(entryPoint);
+		int result = doConsumeAssignment$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$20(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentType());
+		return result.getResult(consumeRuleCall$21(entryPoint));
 	}
 
 	protected int consumeRuleCall$21(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
index eb707a8..5df79af 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
@@ -49,7 +49,15 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -93,11 +101,28 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordPackage(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -105,6 +130,14 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$8$Delimiter());
 	}
 
@@ -119,7 +152,8 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentNamedElements());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -127,6 +161,14 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
index 1a9718d..7167c53 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
@@ -43,7 +43,15 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -66,7 +74,16 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		int result = doConsumeAssignment$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentName());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -74,7 +91,16 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentType());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
index eac73e1..3e8a7dc 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
@@ -47,7 +47,15 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -70,6 +78,14 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele0LexerRuleCallID(), getRuleCall$2$Delimiter());
 	}
 
@@ -84,7 +100,7 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeGroup$3(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -107,10 +123,26 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordFullStop(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele11LexerRuleCallID(), getRuleCall$5$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index 10dd60a..e321f84 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -55,7 +55,15 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -99,11 +107,28 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordRef(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -111,11 +136,28 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordColon(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentType());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -134,7 +176,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$11(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -157,11 +199,28 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordOpposite(), null, false, false, getKeyword$12$Delimiter());
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeCrossReference$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele11AssignmentOpposite());
+		return result.getResult(consumeCrossReference$14(entryPoint));
 	}
 
 	protected int consumeCrossReference$14(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
index b598721..c7fc17b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(attributeConsumer, null, false, false, false, getRule().ele0ParserRuleCallAttribute());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(referenceConsumer, null, false, false, false, getRule().ele1ParserRuleCallReference());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
index 1ed2384..0d6ced3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(entityConsumer, null, false, false, false, getRule().ele0ParserRuleCallEntity());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(dataTypeConsumer, null, false, false, false, getRule().ele1ParserRuleCallDataType());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
index f3bc1c3..4815e83 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
@@ -41,7 +41,16 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeCrossReference$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentReferenced());
+		return result.getResult(consumeCrossReference$2(entryPoint));
 	}
 
 	protected int consumeCrossReference$2(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
index 349a297..c9f2777 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
@@ -40,7 +40,15 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(featureConsumer, null, false, false, false, getRule().ele0ParserRuleCallFeature());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(parameterConsumer, null, false, false, false, getRule().ele1ParserRuleCallParameter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
index 9fbac54..dfe06f9 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
@@ -60,7 +60,15 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -118,11 +126,28 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000KeywordCommercialAt(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001AssignmentSource());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -141,7 +166,8 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$10(int entryPoint) throws Exception {
-		return consumeCrossReference$11(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentEModelElement());
+		return result.getResult(consumeCrossReference$11(entryPoint));
 	}
 
 	protected int consumeCrossReference$11(int entryPoint) throws Exception {
@@ -149,11 +175,28 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$13(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$13(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordLeftParenthesis(), null, false, false, getKeyword$13$Delimiter());
 	}
 
 	protected int consumeAssignment$14(int entryPoint) throws Exception {
-		return consumeRuleCall$15(entryPoint);
+		int result = doConsumeAssignment$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$14(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentContents());
+		return result.getResult(consumeRuleCall$15(entryPoint));
 	}
 
 	protected int consumeRuleCall$15(int entryPoint) throws Exception {
@@ -171,7 +214,7 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$16(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -194,11 +237,28 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010KeywordComma(), null, false, false, getKeyword$17$Delimiter());
 	}
 
 	protected int consumeAssignment$18(int entryPoint) throws Exception {
-		return consumeRuleCall$19(entryPoint);
+		int result = doConsumeAssignment$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$18(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentContents());
+		return result.getResult(consumeRuleCall$19(entryPoint));
 	}
 
 	protected int consumeRuleCall$19(int entryPoint) throws Exception {
@@ -206,6 +266,14 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$20(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$20(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$20$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
index f23725d..1c5f22e 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
@@ -99,7 +99,15 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -174,7 +182,8 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -192,7 +201,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$10(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele0000001Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele0000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -241,7 +250,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$17(int entryPoint) throws Exception {
-		return consumeKeyword$18(entryPoint);
+		int result = doConsumeAssignment$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$17(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010000000AssignmentID());
+		return result.getResult(consumeKeyword$18(entryPoint));
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
@@ -249,7 +267,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$19(int entryPoint) throws Exception {
-		return consumeKeyword$20(entryPoint);
+		int result = doConsumeAssignment$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$19(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010000001AssignmentUnique());
+		return result.getResult(consumeKeyword$20(entryPoint));
 	}
 
 	protected int consumeKeyword$20(int entryPoint) throws Exception {
@@ -257,7 +284,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$21(int entryPoint) throws Exception {
-		return consumeKeyword$22(entryPoint);
+		int result = doConsumeAssignment$21(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$21(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$21(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001000001AssignmentOrdered());
+		return result.getResult(consumeKeyword$22(entryPoint));
 	}
 
 	protected int consumeKeyword$22(int entryPoint) throws Exception {
@@ -265,7 +301,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$23(int entryPoint) throws Exception {
-		return consumeKeyword$24(entryPoint);
+		int result = doConsumeAssignment$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$23(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000100001AssignmentChangeable());
+		return result.getResult(consumeKeyword$24(entryPoint));
 	}
 
 	protected int consumeKeyword$24(int entryPoint) throws Exception {
@@ -273,7 +318,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$25(int entryPoint) throws Exception {
-		return consumeKeyword$26(entryPoint);
+		int result = doConsumeAssignment$25(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$25(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$25(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010001AssignmentVolatile());
+		return result.getResult(consumeKeyword$26(entryPoint));
 	}
 
 	protected int consumeKeyword$26(int entryPoint) throws Exception {
@@ -281,7 +335,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$27(int entryPoint) throws Exception {
-		return consumeKeyword$28(entryPoint);
+		int result = doConsumeAssignment$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$27(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001001AssignmentTransient());
+		return result.getResult(consumeKeyword$28(entryPoint));
 	}
 
 	protected int consumeKeyword$28(int entryPoint) throws Exception {
@@ -289,7 +352,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$29(int entryPoint) throws Exception {
-		return consumeKeyword$30(entryPoint);
+		int result = doConsumeAssignment$29(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$29(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$29(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000101AssignmentUnsettable());
+		return result.getResult(consumeKeyword$30(entryPoint));
 	}
 
 	protected int consumeKeyword$30(int entryPoint) throws Exception {
@@ -297,7 +369,16 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$31(int entryPoint) throws Exception {
-		return consumeKeyword$32(entryPoint);
+		int result = doConsumeAssignment$31(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$31(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$31(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000011AssignmentDerived());
+		return result.getResult(consumeKeyword$32(entryPoint));
 	}
 
 	protected int consumeKeyword$32(int entryPoint) throws Exception {
@@ -305,11 +386,28 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$33(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$33(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$33(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$33(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001KeywordAttr(), null, false, false, getKeyword$33$Delimiter());
 	}
 
 	protected int consumeAssignment$34(int entryPoint) throws Exception {
-		return consumeRuleCall$35(entryPoint);
+		int result = doConsumeAssignment$34(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$34(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$34(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentEGenericType());
+		return result.getResult(consumeRuleCall$35(entryPoint));
 	}
 
 	protected int consumeRuleCall$35(int entryPoint) throws Exception {
@@ -328,7 +426,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$36(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -365,11 +463,28 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$39(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$39(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$39(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$39(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001000KeywordLeftSquareBracket(), null, false, false, getKeyword$39$Delimiter());
 	}
 
 	protected int consumeAssignment$40(int entryPoint) throws Exception {
-		return consumeRuleCall$41(entryPoint);
+		int result = doConsumeAssignment$40(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$40(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$40(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001001AssignmentLowerBound());
+		return result.getResult(consumeRuleCall$41(entryPoint));
 	}
 
 	protected int consumeRuleCall$41(int entryPoint) throws Exception {
@@ -388,7 +503,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$42(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000101Group());
+		final GroupResult result = createGroupResult(getRule().ele000101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -411,11 +526,28 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$43(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$43(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$43(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$43(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001010KeywordFullStopFullStop(), null, false, false, getKeyword$43$Delimiter());
 	}
 
 	protected int consumeAssignment$44(int entryPoint) throws Exception {
-		return consumeRuleCall$45(entryPoint);
+		int result = doConsumeAssignment$44(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$44(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$44(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001011AssignmentUpperBound());
+		return result.getResult(consumeRuleCall$45(entryPoint));
 	}
 
 	protected int consumeRuleCall$45(int entryPoint) throws Exception {
@@ -423,11 +555,28 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$46(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$46(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$46(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$46(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00011KeywordRightSquareBracket(), null, false, false, getKeyword$46$Delimiter());
 	}
 
 	protected int consumeAssignment$47(int entryPoint) throws Exception {
-		return consumeRuleCall$48(entryPoint);
+		int result = doConsumeAssignment$47(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$47(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$47(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$48(entryPoint));
 	}
 
 	protected int consumeRuleCall$48(int entryPoint) throws Exception {
@@ -446,7 +595,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$49(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -469,11 +618,28 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$50(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$50(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$50(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$50(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010KeywordEqualsSign(), null, false, false, getKeyword$50$Delimiter());
 	}
 
 	protected int consumeAssignment$51(int entryPoint) throws Exception {
-		return consumeRuleCall$52(entryPoint);
+		int result = doConsumeAssignment$51(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$51(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$51(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentDefaultValueLiteral());
+		return result.getResult(consumeRuleCall$52(entryPoint));
 	}
 
 	protected int consumeRuleCall$52(int entryPoint) throws Exception {
@@ -481,6 +647,14 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$53(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$53(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$53(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$53(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$53$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
index 0977f5c..3b45d8f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
@@ -86,7 +86,15 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -175,7 +183,8 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$10(int entryPoint) throws Exception {
-		return consumeRuleCall$11(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$11(entryPoint));
 	}
 
 	protected int consumeRuleCall$11(int entryPoint) throws Exception {
@@ -194,7 +203,8 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
-		return consumeKeyword$13(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000001AssignmentAbstract());
+		return result.getResult(consumeKeyword$13(entryPoint));
 	}
 
 	protected int consumeKeyword$13(int entryPoint) throws Exception {
@@ -202,7 +212,15 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$14(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele00000001Alternatives());
+		int result = doConsumeAlternatives$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$14(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele00000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -221,7 +239,16 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$15(int entryPoint) throws Exception {
-		return consumeKeyword$16(entryPoint);
+		int result = doConsumeAssignment$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000010AssignmentInterface());
+		return result.getResult(consumeKeyword$16(entryPoint));
 	}
 
 	protected int consumeKeyword$16(int entryPoint) throws Exception {
@@ -229,11 +256,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000011KeywordClass(), null, false, false, getKeyword$17$Delimiter());
 	}
 
 	protected int consumeAssignment$18(int entryPoint) throws Exception {
-		return consumeRuleCall$19(entryPoint);
+		int result = doConsumeAssignment$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$18(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001AssignmentName());
+		return result.getResult(consumeRuleCall$19(entryPoint));
 	}
 
 	protected int consumeRuleCall$19(int entryPoint) throws Exception {
@@ -252,7 +296,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$20(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000001Group());
+		final GroupResult result = createGroupResult(getRule().ele000001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -289,11 +333,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$23(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$23(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001000KeywordLessThanSign(), null, false, false, getKeyword$23$Delimiter());
 	}
 
 	protected int consumeAssignment$24(int entryPoint) throws Exception {
-		return consumeRuleCall$25(entryPoint);
+		int result = doConsumeAssignment$24(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$24(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$24(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001001AssignmentETypeParameters());
+		return result.getResult(consumeRuleCall$25(entryPoint));
 	}
 
 	protected int consumeRuleCall$25(int entryPoint) throws Exception {
@@ -311,7 +372,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$26(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00000101Group());
+		final GroupResult result = createGroupResult(getRule().ele00000101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -334,11 +395,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$27(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$27(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001010KeywordComma(), null, false, false, getKeyword$27$Delimiter());
 	}
 
 	protected int consumeAssignment$28(int entryPoint) throws Exception {
-		return consumeRuleCall$29(entryPoint);
+		int result = doConsumeAssignment$28(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$28(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$28(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001011AssignmentETypeParameters());
+		return result.getResult(consumeRuleCall$29(entryPoint));
 	}
 
 	protected int consumeRuleCall$29(int entryPoint) throws Exception {
@@ -346,6 +424,14 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$30(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$30(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$30(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$30(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000011KeywordGreaterThanSign(), null, false, false, getKeyword$30$Delimiter());
 	}
 
@@ -361,7 +447,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$31(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00001Group());
+		final GroupResult result = createGroupResult(getRule().ele00001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -391,11 +477,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$33(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$33(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$33(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$33(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000100KeywordExtends(), null, false, false, getKeyword$33$Delimiter());
 	}
 
 	protected int consumeAssignment$34(int entryPoint) throws Exception {
-		return consumeRuleCall$35(entryPoint);
+		int result = doConsumeAssignment$34(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$34(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$34(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000101AssignmentEGenericSuperTypes());
+		return result.getResult(consumeRuleCall$35(entryPoint));
 	}
 
 	protected int consumeRuleCall$35(int entryPoint) throws Exception {
@@ -413,7 +516,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$36(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000011Group());
+		final GroupResult result = createGroupResult(getRule().ele000011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -436,11 +539,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$37(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$37(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$37(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$37(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000110KeywordComma(), null, false, false, getKeyword$37$Delimiter());
 	}
 
 	protected int consumeAssignment$38(int entryPoint) throws Exception {
-		return consumeRuleCall$39(entryPoint);
+		int result = doConsumeAssignment$38(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$38(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$38(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000111AssignmentEGenericSuperTypes());
+		return result.getResult(consumeRuleCall$39(entryPoint));
 	}
 
 	protected int consumeRuleCall$39(int entryPoint) throws Exception {
@@ -459,7 +579,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$40(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -482,11 +602,28 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$41(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$41(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$41(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$41(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00010KeywordColon(), null, false, false, getKeyword$41$Delimiter());
 	}
 
 	protected int consumeAssignment$42(int entryPoint) throws Exception {
-		return consumeRuleCall$43(entryPoint);
+		int result = doConsumeAssignment$42(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$42(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$42(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00011AssignmentInstanceClassName());
+		return result.getResult(consumeRuleCall$43(entryPoint));
 	}
 
 	protected int consumeRuleCall$43(int entryPoint) throws Exception {
@@ -494,6 +631,14 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$44(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$44(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$44(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$44(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$44$Delimiter());
 	}
 
@@ -508,7 +653,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$45(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -527,7 +672,16 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$46(int entryPoint) throws Exception {
-		return consumeRuleCall$47(entryPoint);
+		int result = doConsumeAssignment$46(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$46(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$46(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010AssignmentEStructuralFeatures());
+		return result.getResult(consumeRuleCall$47(entryPoint));
 	}
 
 	protected int consumeRuleCall$47(int entryPoint) throws Exception {
@@ -535,7 +689,16 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$48(int entryPoint) throws Exception {
-		return consumeRuleCall$49(entryPoint);
+		int result = doConsumeAssignment$48(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$48(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$48(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentEOperations());
+		return result.getResult(consumeRuleCall$49(entryPoint));
 	}
 
 	protected int consumeRuleCall$49(int entryPoint) throws Exception {
@@ -543,6 +706,14 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$50(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$50(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$50(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$50(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$50$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
index 6efdcee..9952014 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
@@ -40,7 +40,15 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(eClassDeclConsumer, null, false, false, false, getRule().ele0ParserRuleCallEClassDecl());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(eDataTypeDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEDataTypeDecl());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
index f16fc9f..e6c9c98 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
@@ -59,7 +59,15 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -78,7 +86,15 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$2(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0Group());
+		int result = doConsumeGroup$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$2(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele0Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -146,7 +162,8 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
@@ -165,7 +182,8 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
-		return consumeKeyword$7(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentSerializable());
+		return result.getResult(consumeKeyword$7(entryPoint));
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
@@ -173,11 +191,28 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010000KeywordDatatype(), null, false, false, getKeyword$12$Delimiter());
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010001AssignmentName());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -185,11 +220,28 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$15(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$15(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01001KeywordColon(), null, false, false, getKeyword$15$Delimiter());
 	}
 
 	protected int consumeAssignment$16(int entryPoint) throws Exception {
-		return consumeRuleCall$17(entryPoint);
+		int result = doConsumeAssignment$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$16(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0101AssignmentInstanceClassName());
+		return result.getResult(consumeRuleCall$17(entryPoint));
 	}
 
 	protected int consumeRuleCall$17(int entryPoint) throws Exception {
@@ -197,10 +249,26 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$18(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele011KeywordSemicolon(), null, false, false, getKeyword$18$Delimiter());
 	}
 
 	protected int consumeRuleCall$19(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$19(int entryPoint) throws Exception {
 		return consumeNonTerminal(eEnumDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEEnumDecl());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
index b9d2815..99981ca 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
@@ -54,7 +54,15 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -115,7 +123,8 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -123,11 +132,28 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordEnum(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -135,6 +161,14 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
@@ -148,6 +182,9 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 			case 0:
 				announceNextStep();
 				result = doConsumeAssignment$12(nextEntryPoint());
+				while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+					result = doConsumeAssignment$12(nextEntryPoint());
+				}
 			case 1:
 				if (result == ConsumeResult.SUCCESS) {
 					marker.flush();
@@ -168,7 +205,8 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
-		return consumeRuleCall$13(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentELiterals());
+		return result.getResult(consumeRuleCall$13(entryPoint));
 	}
 
 	protected int consumeRuleCall$13(int entryPoint) throws Exception {
@@ -176,6 +214,14 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$14$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
index 322a08e..b74cdaa 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
@@ -59,7 +59,15 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -113,7 +121,8 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -121,7 +130,16 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
@@ -140,7 +158,7 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeGroup$9(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -163,11 +181,28 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0010KeywordEqualsSign(), null, false, false, getKeyword$10$Delimiter());
 	}
 
 	protected int consumeAssignment$11(int entryPoint) throws Exception {
-		return consumeRuleCall$12(entryPoint);
+		int result = doConsumeAssignment$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$11(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0011AssignmentValue());
+		return result.getResult(consumeRuleCall$12(entryPoint));
 	}
 
 	protected int consumeRuleCall$12(int entryPoint) throws Exception {
@@ -186,7 +221,8 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentLiteral());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -194,6 +230,14 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$15(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$15(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$15$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
index cadae2c..84c0b1f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
@@ -67,7 +67,15 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -91,7 +99,15 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$3(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00Group());
+		int result = doConsumeGroup$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$3(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele00Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -114,7 +130,16 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeCrossReference$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000AssignmentEClassifier());
+		return result.getResult(consumeCrossReference$5(entryPoint));
 	}
 
 	protected int consumeCrossReference$5(int entryPoint) throws Exception {
@@ -133,7 +158,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeGroup$7(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -170,11 +195,28 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001000KeywordLessThanSign(), null, false, false, getKeyword$10$Delimiter());
 	}
 
 	protected int consumeAssignment$11(int entryPoint) throws Exception {
-		return consumeRuleCall$12(entryPoint);
+		int result = doConsumeAssignment$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$11(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001001AssignmentETypeArguments());
+		return result.getResult(consumeRuleCall$12(entryPoint));
 	}
 
 	protected int consumeRuleCall$12(int entryPoint) throws Exception {
@@ -192,7 +234,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeGroup$13(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00101Group());
+		final GroupResult result = createGroupResult(getRule().ele00101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -215,11 +257,28 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001010KeywordComma(), null, false, false, getKeyword$14$Delimiter());
 	}
 
 	protected int consumeAssignment$15(int entryPoint) throws Exception {
-		return consumeRuleCall$16(entryPoint);
+		int result = doConsumeAssignment$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001011AssignmentETypeArguments());
+		return result.getResult(consumeRuleCall$16(entryPoint));
 	}
 
 	protected int consumeRuleCall$16(int entryPoint) throws Exception {
@@ -227,11 +286,27 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0011KeywordGreaterThanSign(), null, false, false, getKeyword$17$Delimiter());
 	}
 
 	protected int consumeGroup$18(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		int result = doConsumeGroup$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$18(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -254,11 +329,28 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$19(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$19(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010KeywordNumberSign(), null, false, false, getKeyword$19$Delimiter());
 	}
 
 	protected int consumeAssignment$20(int entryPoint) throws Exception {
-		return consumeCrossReference$21(entryPoint);
+		int result = doConsumeAssignment$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$20(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentETypeParameter());
+		return result.getResult(consumeCrossReference$21(entryPoint));
 	}
 
 	protected int consumeCrossReference$21(int entryPoint) throws Exception {
@@ -266,7 +358,15 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$23(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		int result = doConsumeGroup$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$23(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -289,11 +389,27 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$24(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$24(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$24(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$24(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordQuestionMark(), null, false, false, getKeyword$24$Delimiter());
 	}
 
 	protected int consumeAlternatives$25(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele11Alternatives());
+		int result = doConsumeAlternatives$25(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$25(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$25(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele11Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -312,7 +428,15 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$26(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele110Group());
+		int result = doConsumeGroup$26(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$26(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$26(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele110Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -335,11 +459,28 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$27(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$27(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1100KeywordExtends(), null, false, false, getKeyword$27$Delimiter());
 	}
 
 	protected int consumeAssignment$28(int entryPoint) throws Exception {
-		return consumeRuleCall$29(entryPoint);
+		int result = doConsumeAssignment$28(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$28(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$28(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1101AssignmentEUpperBound());
+		return result.getResult(consumeRuleCall$29(entryPoint));
 	}
 
 	protected int consumeRuleCall$29(int entryPoint) throws Exception {
@@ -347,7 +488,15 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$30(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele111Group());
+		int result = doConsumeGroup$30(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$30(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$30(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele111Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -370,11 +519,28 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$31(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$31(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$31(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$31(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1110KeywordSuper(), null, false, false, getKeyword$31$Delimiter());
 	}
 
 	protected int consumeAssignment$32(int entryPoint) throws Exception {
-		return consumeRuleCall$33(entryPoint);
+		int result = doConsumeAssignment$32(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$32(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$32(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1111AssignmentELowerBound());
+		return result.getResult(consumeRuleCall$33(entryPoint));
 	}
 
 	protected int consumeRuleCall$33(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
index 31ba3ed..8fa671a 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
@@ -58,7 +58,15 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -77,7 +85,15 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeGroup$2(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0Group());
+		int result = doConsumeGroup$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$2(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele0Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -100,7 +116,16 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeCrossReference$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00AssignmentEClassifier());
+		return result.getResult(consumeCrossReference$4(entryPoint));
 	}
 
 	protected int consumeCrossReference$4(int entryPoint) throws Exception {
@@ -119,7 +144,7 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int doConsumeGroup$6(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -156,11 +181,28 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$9(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$9(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01000KeywordLessThanSign(), null, false, false, getKeyword$9$Delimiter());
 	}
 
 	protected int consumeAssignment$10(int entryPoint) throws Exception {
-		return consumeRuleCall$11(entryPoint);
+		int result = doConsumeAssignment$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$10(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01001AssignmentETypeArguments());
+		return result.getResult(consumeRuleCall$11(entryPoint));
 	}
 
 	protected int consumeRuleCall$11(int entryPoint) throws Exception {
@@ -178,7 +220,7 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int doConsumeGroup$12(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0101Group());
+		final GroupResult result = createGroupResult(getRule().ele0101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -201,11 +243,28 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$13(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$13(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01010KeywordComma(), null, false, false, getKeyword$13$Delimiter());
 	}
 
 	protected int consumeAssignment$14(int entryPoint) throws Exception {
-		return consumeRuleCall$15(entryPoint);
+		int result = doConsumeAssignment$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$14(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01011AssignmentETypeArguments());
+		return result.getResult(consumeRuleCall$15(entryPoint));
 	}
 
 	protected int consumeRuleCall$15(int entryPoint) throws Exception {
@@ -213,11 +272,27 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$16(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$16(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele011KeywordGreaterThanSign(), null, false, false, getKeyword$16$Delimiter());
 	}
 
 	protected int consumeGroup$17(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		int result = doConsumeGroup$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$17(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -240,11 +315,28 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$18(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordNumberSign(), null, false, false, getKeyword$18$Delimiter());
 	}
 
 	protected int consumeAssignment$19(int entryPoint) throws Exception {
-		return consumeCrossReference$20(entryPoint);
+		int result = doConsumeAssignment$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$19(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele11AssignmentETypeParameter());
+		return result.getResult(consumeCrossReference$20(entryPoint));
 	}
 
 	protected int consumeCrossReference$20(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
index 149735f..425dcdd 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
@@ -88,7 +88,15 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -184,7 +192,8 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$11(int entryPoint) throws Exception {
-		return consumeRuleCall$12(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000000000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$12(entryPoint));
 	}
 
 	protected int consumeRuleCall$12(int entryPoint) throws Exception {
@@ -202,7 +211,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$13(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele0000000001Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele0000000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -221,7 +230,16 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$14(int entryPoint) throws Exception {
-		return consumeKeyword$15(entryPoint);
+		int result = doConsumeAssignment$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$14(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000000010AssignmentUnique());
+		return result.getResult(consumeKeyword$15(entryPoint));
 	}
 
 	protected int consumeKeyword$15(int entryPoint) throws Exception {
@@ -229,7 +247,16 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$16(int entryPoint) throws Exception {
-		return consumeKeyword$17(entryPoint);
+		int result = doConsumeAssignment$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$16(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000000011AssignmentOrdered());
+		return result.getResult(consumeKeyword$17(entryPoint));
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
@@ -237,11 +264,27 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$18(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000001KeywordOp(), null, false, false, getKeyword$18$Delimiter());
 	}
 
 	protected int consumeAlternatives$19(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele00000001Alternatives());
+		int result = doConsumeAlternatives$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$19(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele00000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -260,7 +303,16 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$20(int entryPoint) throws Exception {
-		return consumeRuleCall$21(entryPoint);
+		int result = doConsumeAssignment$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$20(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000010AssignmentEGenericType());
+		return result.getResult(consumeRuleCall$21(entryPoint));
 	}
 
 	protected int consumeRuleCall$21(int entryPoint) throws Exception {
@@ -268,11 +320,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$22(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$22(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$22(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$22(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000011KeywordVoid(), null, false, false, getKeyword$22$Delimiter());
 	}
 
 	protected int consumeAssignment$23(int entryPoint) throws Exception {
-		return consumeRuleCall$24(entryPoint);
+		int result = doConsumeAssignment$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$23(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001AssignmentName());
+		return result.getResult(consumeRuleCall$24(entryPoint));
 	}
 
 	protected int consumeRuleCall$24(int entryPoint) throws Exception {
@@ -291,7 +360,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$25(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000001Group());
+		final GroupResult result = createGroupResult(getRule().ele000001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -328,11 +397,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$28(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$28(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$28(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$28(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001000KeywordLessThanSign(), null, false, false, getKeyword$28$Delimiter());
 	}
 
 	protected int consumeAssignment$29(int entryPoint) throws Exception {
-		return consumeRuleCall$30(entryPoint);
+		int result = doConsumeAssignment$29(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$29(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$29(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001001AssignmentETypeParameters());
+		return result.getResult(consumeRuleCall$30(entryPoint));
 	}
 
 	protected int consumeRuleCall$30(int entryPoint) throws Exception {
@@ -350,7 +436,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$31(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00000101Group());
+		final GroupResult result = createGroupResult(getRule().ele00000101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -373,11 +459,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$32(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$32(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$32(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$32(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001010KeywordComma(), null, false, false, getKeyword$32$Delimiter());
 	}
 
 	protected int consumeAssignment$33(int entryPoint) throws Exception {
-		return consumeRuleCall$34(entryPoint);
+		int result = doConsumeAssignment$33(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$33(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$33(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001011AssignmentETypeParameters());
+		return result.getResult(consumeRuleCall$34(entryPoint));
 	}
 
 	protected int consumeRuleCall$34(int entryPoint) throws Exception {
@@ -385,10 +488,26 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$35(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$35(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$35(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$35(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000011KeywordGreaterThanSign(), null, false, false, getKeyword$35$Delimiter());
 	}
 
 	protected int consumeKeyword$36(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$36(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$36(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$36(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordLeftParenthesis(), null, false, false, getKeyword$36$Delimiter());
 	}
 
@@ -404,7 +523,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$37(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -427,7 +546,16 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$38(int entryPoint) throws Exception {
-		return consumeRuleCall$39(entryPoint);
+		int result = doConsumeAssignment$38(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$38(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$38(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00010AssignmentEParameters());
+		return result.getResult(consumeRuleCall$39(entryPoint));
 	}
 
 	protected int consumeRuleCall$39(int entryPoint) throws Exception {
@@ -445,7 +573,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$40(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00011Group());
+		final GroupResult result = createGroupResult(getRule().ele00011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -468,11 +596,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$41(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$41(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$41(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$41(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000110KeywordComma(), null, false, false, getKeyword$41$Delimiter());
 	}
 
 	protected int consumeAssignment$42(int entryPoint) throws Exception {
-		return consumeRuleCall$43(entryPoint);
+		int result = doConsumeAssignment$42(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$42(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$42(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000111AssignmentEParameters());
+		return result.getResult(consumeRuleCall$43(entryPoint));
 	}
 
 	protected int consumeRuleCall$43(int entryPoint) throws Exception {
@@ -480,6 +625,14 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$44(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$44(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$44(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$44(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordRightParenthesis(), null, false, false, getKeyword$44$Delimiter());
 	}
 
@@ -495,7 +648,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$45(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -525,11 +678,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$47(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$47(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$47(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$47(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0100KeywordThrows(), null, false, false, getKeyword$47$Delimiter());
 	}
 
 	protected int consumeAssignment$48(int entryPoint) throws Exception {
-		return consumeRuleCall$49(entryPoint);
+		int result = doConsumeAssignment$48(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$48(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$48(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0101AssignmentEGenericExceptions());
+		return result.getResult(consumeRuleCall$49(entryPoint));
 	}
 
 	protected int consumeRuleCall$49(int entryPoint) throws Exception {
@@ -547,7 +717,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$50(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele011Group());
+		final GroupResult result = createGroupResult(getRule().ele011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -570,11 +740,28 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$51(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$51(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$51(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$51(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0110KeywordComma(), null, false, false, getKeyword$51$Delimiter());
 	}
 
 	protected int consumeAssignment$52(int entryPoint) throws Exception {
-		return consumeRuleCall$53(entryPoint);
+		int result = doConsumeAssignment$52(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$52(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$52(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0111AssignmentEGenericExceptions());
+		return result.getResult(consumeRuleCall$53(entryPoint));
 	}
 
 	protected int consumeRuleCall$53(int entryPoint) throws Exception {
@@ -582,6 +769,14 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$54(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$54(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$54(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$54(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$54$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
index 0dc14c7..dd6ba93 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
@@ -70,7 +70,15 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -173,7 +181,8 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
-		return consumeRuleCall$13(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000000000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$13(entryPoint));
 	}
 
 	protected int consumeRuleCall$13(int entryPoint) throws Exception {
@@ -181,11 +190,28 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00000000001KeywordPackage(), null, false, false, getKeyword$14$Delimiter());
 	}
 
 	protected int consumeAssignment$15(int entryPoint) throws Exception {
-		return consumeRuleCall$16(entryPoint);
+		int result = doConsumeAssignment$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000000001AssignmentName());
+		return result.getResult(consumeRuleCall$16(entryPoint));
 	}
 
 	protected int consumeRuleCall$16(int entryPoint) throws Exception {
@@ -193,15 +219,40 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000001KeywordNsURI(), null, false, false, getKeyword$17$Delimiter());
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$18(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00000001KeywordEqualsSign(), null, false, false, getKeyword$18$Delimiter());
 	}
 
 	protected int consumeAssignment$19(int entryPoint) throws Exception {
-		return consumeRuleCall$20(entryPoint);
+		int result = doConsumeAssignment$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$19(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001AssignmentNsURI());
+		return result.getResult(consumeRuleCall$20(entryPoint));
 	}
 
 	protected int consumeRuleCall$20(int entryPoint) throws Exception {
@@ -209,15 +260,40 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$21(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$21(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$21(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$21(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001KeywordNsPrefix(), null, false, false, getKeyword$21$Delimiter());
 	}
 
 	protected int consumeKeyword$22(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$22(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$22(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$22(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordEqualsSign(), null, false, false, getKeyword$22$Delimiter());
 	}
 
 	protected int consumeAssignment$23(int entryPoint) throws Exception {
-		return consumeRuleCall$24(entryPoint);
+		int result = doConsumeAssignment$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$23(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentNsPrefix());
+		return result.getResult(consumeRuleCall$24(entryPoint));
 	}
 
 	protected int consumeRuleCall$24(int entryPoint) throws Exception {
@@ -225,6 +301,14 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$25(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$25(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$25(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$25(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$25$Delimiter());
 	}
 
@@ -239,7 +323,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$26(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -258,7 +342,16 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$27(int entryPoint) throws Exception {
-		return consumeRuleCall$28(entryPoint);
+		int result = doConsumeAssignment$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$27(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010AssignmentESubpackages());
+		return result.getResult(consumeRuleCall$28(entryPoint));
 	}
 
 	protected int consumeRuleCall$28(int entryPoint) throws Exception {
@@ -266,7 +359,16 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$29(int entryPoint) throws Exception {
-		return consumeRuleCall$30(entryPoint);
+		int result = doConsumeAssignment$29(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$29(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$29(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentEClassifiers());
+		return result.getResult(consumeRuleCall$30(entryPoint));
 	}
 
 	protected int consumeRuleCall$30(int entryPoint) throws Exception {
@@ -274,6 +376,14 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$31(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$31(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$31(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$31(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$31$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
index a54575d..fbdf92f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
@@ -45,7 +45,15 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -85,7 +93,8 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
@@ -93,7 +102,16 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentEGenericType());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -101,7 +119,16 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
index 5cfe604..4e54156 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
@@ -100,7 +100,15 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -175,7 +183,8 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -193,7 +202,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$10(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele0000001Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele0000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -242,7 +251,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$17(int entryPoint) throws Exception {
-		return consumeKeyword$18(entryPoint);
+		int result = doConsumeAssignment$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$17(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010000000AssignmentResolveProxies());
+		return result.getResult(consumeKeyword$18(entryPoint));
 	}
 
 	protected int consumeKeyword$18(int entryPoint) throws Exception {
@@ -250,7 +268,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$19(int entryPoint) throws Exception {
-		return consumeKeyword$20(entryPoint);
+		int result = doConsumeAssignment$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$19(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010000001AssignmentUnique());
+		return result.getResult(consumeKeyword$20(entryPoint));
 	}
 
 	protected int consumeKeyword$20(int entryPoint) throws Exception {
@@ -258,7 +285,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$21(int entryPoint) throws Exception {
-		return consumeKeyword$22(entryPoint);
+		int result = doConsumeAssignment$21(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$21(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$21(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001000001AssignmentOrdered());
+		return result.getResult(consumeKeyword$22(entryPoint));
 	}
 
 	protected int consumeKeyword$22(int entryPoint) throws Exception {
@@ -266,7 +302,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$23(int entryPoint) throws Exception {
-		return consumeKeyword$24(entryPoint);
+		int result = doConsumeAssignment$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$23(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000100001AssignmentChangeable());
+		return result.getResult(consumeKeyword$24(entryPoint));
 	}
 
 	protected int consumeKeyword$24(int entryPoint) throws Exception {
@@ -274,7 +319,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$25(int entryPoint) throws Exception {
-		return consumeKeyword$26(entryPoint);
+		int result = doConsumeAssignment$25(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$25(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$25(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000010001AssignmentVolatile());
+		return result.getResult(consumeKeyword$26(entryPoint));
 	}
 
 	protected int consumeKeyword$26(int entryPoint) throws Exception {
@@ -282,7 +336,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$27(int entryPoint) throws Exception {
-		return consumeKeyword$28(entryPoint);
+		int result = doConsumeAssignment$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$27(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000001001AssignmentTransient());
+		return result.getResult(consumeKeyword$28(entryPoint));
 	}
 
 	protected int consumeKeyword$28(int entryPoint) throws Exception {
@@ -290,7 +353,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$29(int entryPoint) throws Exception {
-		return consumeKeyword$30(entryPoint);
+		int result = doConsumeAssignment$29(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$29(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$29(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000000101AssignmentUnsettable());
+		return result.getResult(consumeKeyword$30(entryPoint));
 	}
 
 	protected int consumeKeyword$30(int entryPoint) throws Exception {
@@ -298,7 +370,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$31(int entryPoint) throws Exception {
-		return consumeKeyword$32(entryPoint);
+		int result = doConsumeAssignment$31(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$31(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$31(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000011AssignmentDerived());
+		return result.getResult(consumeKeyword$32(entryPoint));
 	}
 
 	protected int consumeKeyword$32(int entryPoint) throws Exception {
@@ -306,7 +387,15 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$33(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele000001Alternatives());
+		int result = doConsumeAlternatives$33(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$33(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$33(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele000001Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -325,7 +414,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$34(int entryPoint) throws Exception {
-		return consumeKeyword$35(entryPoint);
+		int result = doConsumeAssignment$34(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$34(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$34(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000010AssignmentContainment());
+		return result.getResult(consumeKeyword$35(entryPoint));
 	}
 
 	protected int consumeKeyword$35(int entryPoint) throws Exception {
@@ -333,11 +431,28 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$36(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$36(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$36(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$36(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000011KeywordRef(), null, false, false, getKeyword$36$Delimiter());
 	}
 
 	protected int consumeAssignment$37(int entryPoint) throws Exception {
-		return consumeRuleCall$38(entryPoint);
+		int result = doConsumeAssignment$37(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$37(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$37(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00001AssignmentEGenericType());
+		return result.getResult(consumeRuleCall$38(entryPoint));
 	}
 
 	protected int consumeRuleCall$38(int entryPoint) throws Exception {
@@ -356,7 +471,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$39(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -393,11 +508,28 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$42(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$42(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$42(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$42(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001000KeywordLeftSquareBracket(), null, false, false, getKeyword$42$Delimiter());
 	}
 
 	protected int consumeAssignment$43(int entryPoint) throws Exception {
-		return consumeRuleCall$44(entryPoint);
+		int result = doConsumeAssignment$43(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$43(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$43(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001001AssignmentLowerBound());
+		return result.getResult(consumeRuleCall$44(entryPoint));
 	}
 
 	protected int consumeRuleCall$44(int entryPoint) throws Exception {
@@ -416,7 +548,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$45(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000101Group());
+		final GroupResult result = createGroupResult(getRule().ele000101Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -439,11 +571,28 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$46(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$46(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$46(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$46(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001010KeywordFullStopFullStop(), null, false, false, getKeyword$46$Delimiter());
 	}
 
 	protected int consumeAssignment$47(int entryPoint) throws Exception {
-		return consumeRuleCall$48(entryPoint);
+		int result = doConsumeAssignment$47(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$47(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$47(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001011AssignmentUpperBound());
+		return result.getResult(consumeRuleCall$48(entryPoint));
 	}
 
 	protected int consumeRuleCall$48(int entryPoint) throws Exception {
@@ -451,6 +600,14 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$49(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$49(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$49(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$49(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00011KeywordRightSquareBracket(), null, false, false, getKeyword$49$Delimiter());
 	}
 
@@ -466,7 +623,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$50(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -489,11 +646,28 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$51(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$51(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$51(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$51(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0010KeywordNumberSign(), null, false, false, getKeyword$51$Delimiter());
 	}
 
 	protected int consumeAssignment$52(int entryPoint) throws Exception {
-		return consumeCrossReference$53(entryPoint);
+		int result = doConsumeAssignment$52(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$52(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$52(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0011AssignmentEOpposite());
+		return result.getResult(consumeCrossReference$53(entryPoint));
 	}
 
 	protected int consumeCrossReference$53(int entryPoint) throws Exception {
@@ -501,7 +675,16 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$55(int entryPoint) throws Exception {
-		return consumeRuleCall$56(entryPoint);
+		int result = doConsumeAssignment$55(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$55(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$55(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$56(entryPoint));
 	}
 
 	protected int consumeRuleCall$56(int entryPoint) throws Exception {
@@ -509,6 +692,14 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$57(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$57(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$57(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$57(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$57$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
index b2861ca..a6a516b 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
@@ -40,7 +40,15 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -59,10 +67,26 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeNonTerminal(eAttributeDeclConsumer, null, false, false, false, getRule().ele0ParserRuleCallEAttributeDecl());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(eReferenceDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEReferenceDecl());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
index e7eb41e..8e9a459 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
@@ -46,7 +46,15 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -69,7 +77,16 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		int result = doConsumeAssignment$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentName());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -88,7 +105,7 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 
 	protected int doConsumeGroup$4(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -111,11 +128,28 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordExtends(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele11AssignmentEBounds());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
index 88a2436..b91f797 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
@@ -40,7 +40,15 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,7 +81,8 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentImports());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -81,7 +90,16 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentPackage());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
index 8c3e125..d83d98c 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
@@ -55,7 +55,15 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -92,6 +100,14 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordImport(), null, false, false, getKeyword$4$Delimiter());
 	}
 
@@ -107,7 +123,7 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int doConsumeGroup$5(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -130,7 +146,16 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0010AssignmentAlias());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -138,11 +163,28 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0011KeywordEqualsSign(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentImportURI());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -150,6 +192,14 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
index 1827a9e..a19a991 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
@@ -49,7 +49,15 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -79,7 +87,16 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00AssignmentDetailKey());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
@@ -87,11 +104,28 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordEqualsSign(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentDetailValue());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
index c29ba55..2e40a04 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
@@ -38,6 +38,14 @@ public final class EcoreDslMapEntrySuperConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$1(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$1(int entryPoint) throws Exception {
 		return consumeNonTerminal(mapEntryConsumer, null, false, false, false, getRule().eleParserRuleCallMapEntry());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
index d8d7d92..771d9cf 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
@@ -45,7 +45,15 @@ public final class EcoreDslMultiplicityExprConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -69,14 +77,38 @@ public final class EcoreDslMultiplicityExprConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$3(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$3(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00KeywordPlusSign(), null, false, false, getKeyword$3$Delimiter());
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordQuestionMark(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordAsterisk(), null, false, false, getKeyword$5$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
index 8056a3f..6dfaedb 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
@@ -50,7 +50,15 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,6 +81,14 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele0LexerRuleCallID(), getRuleCall$2$Delimiter());
 	}
 
@@ -87,7 +103,7 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$3(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -110,7 +126,15 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$4(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele10Alternatives());
+		int result = doConsumeAlternatives$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$4(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele10Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -129,14 +153,38 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele100KeywordFullStop(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele101Keyword$(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$7(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele11LexerRuleCallID(), getRuleCall$7$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
index ddaa8da..36fe044 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
@@ -44,7 +44,15 @@ public final class EcoreDslSINTConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -82,6 +90,14 @@ public final class EcoreDslSINTConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeTerminal(intConsumer, null, false, false, getRule().ele1LexerRuleCallINT(), getRuleCall$3$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
index 3d5ceb8..ded9830 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
@@ -43,7 +43,15 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -62,10 +70,26 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeTerminal(stringConsumer, null, false, false, getRule().ele0LexerRuleCallSTRING(), getRuleCall$2$Delimiter());
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(qidConsumer, null, false, true, false, getRule().ele1ParserRuleCallQID());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
index 37b7508..3659129 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
@@ -56,7 +56,15 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -117,7 +125,8 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000AssignmentEAnnotations());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -125,11 +134,28 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordPackage(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -137,6 +163,14 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
@@ -151,7 +185,7 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAlternatives$12(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
+		final AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -170,7 +204,16 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele010AssignmentESubpackages());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -178,7 +221,16 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$15(int entryPoint) throws Exception {
-		return consumeRuleCall$16(entryPoint);
+		int result = doConsumeAssignment$15(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$15(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentEClassifiers());
+		return result.getResult(consumeRuleCall$16(entryPoint));
 	}
 
 	protected int consumeRuleCall$16(int entryPoint) throws Exception {
@@ -186,6 +238,14 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$17$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
index f12ce4a..6a55086 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
@@ -44,7 +44,15 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,7 +75,16 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		int result = doConsumeAssignment$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentName());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -75,7 +92,16 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentCode());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
index 2464ff7..2172f59 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
@@ -47,7 +47,15 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -88,7 +96,8 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
-		return consumeKeyword$4(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00AssignmentResetting());
+		return result.getResult(consumeKeyword$4(entryPoint));
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
@@ -96,7 +105,16 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -104,7 +122,16 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeRuleCall$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentCode());
+		return result.getResult(consumeRuleCall$8(entryPoint));
 	}
 
 	protected int consumeRuleCall$8(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
index 25b806f..9fa47be 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
@@ -61,7 +61,15 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -105,11 +113,28 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordState(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -128,7 +153,7 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeGroup$8(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -165,10 +190,26 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001000KeywordActions(), null, false, false, getKeyword$11$Delimiter());
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001001KeywordLeftCurlyBracket(), null, false, false, getKeyword$12$Delimiter());
 	}
 
@@ -182,6 +223,9 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 			case 0:
 				announceNextStep();
 				result = doConsumeAssignment$13(nextEntryPoint());
+				while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+					result = doConsumeAssignment$13(nextEntryPoint());
+				}
 			case 1:
 				if (result == ConsumeResult.SUCCESS) {
 					marker.flush();
@@ -202,7 +246,8 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
-		return consumeCrossReference$14(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele00101AssignmentActions());
+		return result.getResult(consumeCrossReference$14(entryPoint));
 	}
 
 	protected int consumeCrossReference$14(int entryPoint) throws Exception {
@@ -210,6 +255,14 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$16(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$16(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0011KeywordRightCurlyBracket(), null, false, false, getKeyword$16$Delimiter());
 	}
 
@@ -224,7 +277,8 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$17(int entryPoint) throws Exception {
-		return consumeRuleCall$18(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentTransitions());
+		return result.getResult(consumeRuleCall$18(entryPoint));
 	}
 
 	protected int consumeRuleCall$18(int entryPoint) throws Exception {
@@ -232,6 +286,14 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$19(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$19(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordEnd(), null, false, false, getKeyword$19$Delimiter());
 	}
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
index b2933b3..fa4de4b 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
@@ -54,7 +54,15 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -112,6 +120,14 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000000KeywordEvents(), null, false, false, getKeyword$7$Delimiter());
 	}
 
@@ -126,7 +142,8 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele000001AssignmentEvents());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -134,10 +151,26 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordEnd(), null, false, false, getKeyword$10$Delimiter());
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordCommands(), null, false, false, getKeyword$11$Delimiter());
 	}
 
@@ -152,7 +185,8 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
-		return consumeRuleCall$13(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentCommands());
+		return result.getResult(consumeRuleCall$13(entryPoint));
 	}
 
 	protected int consumeRuleCall$13(int entryPoint) throws Exception {
@@ -160,6 +194,14 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordEnd(), null, false, false, getKeyword$14$Delimiter());
 	}
 
@@ -174,7 +216,8 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$15(int entryPoint) throws Exception {
-		return consumeRuleCall$16(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentStates());
+		return result.getResult(consumeRuleCall$16(entryPoint));
 	}
 
 	protected int consumeRuleCall$16(int entryPoint) throws Exception {
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
index 789047f..16975f6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
@@ -47,7 +47,15 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -77,7 +85,16 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeCrossReference$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00AssignmentEvent());
+		return result.getResult(consumeCrossReference$4(entryPoint));
 	}
 
 	protected int consumeCrossReference$4(int entryPoint) throws Exception {
@@ -85,11 +102,28 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$6(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordEqualsSignGreaterThanSign(), null, false, false, getKeyword$6$Delimiter());
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeCrossReference$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentState());
+		return result.getResult(consumeCrossReference$8(entryPoint));
 	}
 
 	protected int consumeCrossReference$8(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
index e105019..2e5eebd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
@@ -44,7 +44,15 @@ public final class ImportUriTestLanguageImportConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class ImportUriTestLanguageImportConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordImport(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentImportURI());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
index d515191..7c7970e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
@@ -40,7 +40,15 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,7 +81,8 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentImports());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -91,7 +100,8 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentTypes());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
index 3d7a536..2a5ab8e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
@@ -50,7 +50,15 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -87,11 +95,28 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordType(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -99,11 +124,28 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordExtends(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeCrossReference$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentExtends());
+		return result.getResult(consumeCrossReference$9(entryPoint));
 	}
 
 	protected int consumeCrossReference$9(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
index a5ecc37..35e661b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
@@ -44,7 +44,15 @@ public final class LangATestLanguageImportConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class LangATestLanguageImportConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordImport(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentUri());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
index 79dbe7a..02a1d52 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
@@ -40,7 +40,15 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,7 +81,8 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentImports());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -91,7 +100,8 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentTypes());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
index cb899db..30744fb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
@@ -50,7 +50,15 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -87,11 +95,28 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordType(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -99,11 +124,28 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer {
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordExtends(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeCrossReference$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentExtends());
+		return result.getResult(consumeCrossReference$9(entryPoint));
 	}
 
 	protected int consumeCrossReference$9(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
index 5828921..47e09bd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
@@ -55,7 +55,15 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -110,7 +118,8 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
-		return consumeKeyword$6(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000AssignmentOptional());
+		return result.getResult(consumeKeyword$6(entryPoint));
 	}
 
 	protected int consumeKeyword$6(int entryPoint) throws Exception {
@@ -118,11 +127,28 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordElement(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -140,7 +166,8 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$10(int entryPoint) throws Exception {
-		return consumeRuleCall$11(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentDescriptions());
+		return result.getResult(consumeRuleCall$11(entryPoint));
 	}
 
 	protected int consumeRuleCall$11(int entryPoint) throws Exception {
@@ -148,6 +175,14 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$12$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java
index 2abd44f..490a4a8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java
@@ -48,7 +48,8 @@ public final class DummyTestLanguageModelConsumer extends NonTerminalConsumer {
 	}
 
 	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentElements());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java
index b134d96..69adef9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java
@@ -41,7 +41,16 @@ public final class LowerCaseNamedTestLanguageModelConsumer extends NonTerminalCo
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentName());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java
index fd0ded0..fac95c4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java
@@ -41,7 +41,15 @@ public final class AbstractTestLanguageAbstractCallExtendedParserRuleConsumer ex
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -64,6 +72,14 @@ public final class AbstractTestLanguageAbstractCallExtendedParserRuleConsumer ex
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordExtendedmodel(), null, false, false, getKeyword$2$Delimiter());
 	}
 
@@ -78,7 +94,8 @@ public final class AbstractTestLanguageAbstractCallExtendedParserRuleConsumer ex
 	}
 
 	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentElements());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java
index 647e1b4..e5b0fae 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java
@@ -41,7 +41,15 @@ public final class AbstractTestLanguageAbstractCallOverridenParserRuleConsumer e
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -64,6 +72,14 @@ public final class AbstractTestLanguageAbstractCallOverridenParserRuleConsumer e
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordOverridemodel(), null, false, false, getKeyword$2$Delimiter());
 	}
 
@@ -78,7 +94,8 @@ public final class AbstractTestLanguageAbstractCallOverridenParserRuleConsumer e
 	}
 
 	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentElements());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java
index a4ab51d..9e6efc0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java
@@ -44,7 +44,15 @@ public final class AbstractTestLanguageExtendableParserRuleConsumer extends NonT
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class AbstractTestLanguageExtendableParserRuleConsumer extends NonT
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordElement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
index 93f788d..2963cc6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
@@ -44,7 +44,15 @@ public final class AbstractTestLanguageInheritedParserRuleConsumer extends NonTe
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class AbstractTestLanguageInheritedParserRuleConsumer extends NonTe
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordElement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java
index 044331c..954355a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java
@@ -44,7 +44,15 @@ public final class AbstractTestLanguageOverridableParserRule2Consumer extends No
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class AbstractTestLanguageOverridableParserRule2Consumer extends No
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordOtherElement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java
index eba7a87..cc4d458 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java
@@ -44,7 +44,15 @@ public final class AbstractTestLanguageOverridableParserRuleConsumer extends Non
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class AbstractTestLanguageOverridableParserRuleConsumer extends Non
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordElement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/BaseInheritanceTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/BaseInheritanceTestLanguageModelConsumer.java
index cb13b48..6585a70 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/BaseInheritanceTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/BaseInheritanceTestLanguageModelConsumer.java
@@ -44,7 +44,15 @@ public final class BaseInheritanceTestLanguageModelConsumer extends NonTerminalC
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class BaseInheritanceTestLanguageModelConsumer extends NonTerminalC
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordModel(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallExtendedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallExtendedParserRuleConsumer.java
index 31a0829..1a9c6d7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallExtendedParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallExtendedParserRuleConsumer.java
@@ -38,7 +38,16 @@ public final class ConcreteTestLanguageCallExtendedParserRuleConsumer extends No
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentCall());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallOverridenParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallOverridenParserRuleConsumer.java
index 90f1e65..b05e221 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallOverridenParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageCallOverridenParserRuleConsumer.java
@@ -38,7 +38,16 @@ public final class ConcreteTestLanguageCallOverridenParserRuleConsumer extends N
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentCall());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
index 1984078..556ad9a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
@@ -49,7 +49,15 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -86,11 +94,28 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordModel(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentMagicNumber());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -98,6 +123,14 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, getKeyword$7$Delimiter());
 	}
 
@@ -112,7 +145,8 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer
 	}
 
 	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentElements());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageExtendableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageExtendableParserRuleConsumer.java
index 9f1c35a..2e7d2d9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageExtendableParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageExtendableParserRuleConsumer.java
@@ -42,7 +42,15 @@ public final class ConcreteTestLanguageExtendableParserRuleConsumer extends NonT
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -66,14 +74,38 @@ public final class ConcreteTestLanguageExtendableParserRuleConsumer extends NonT
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(subrule1Consumer, null, false, false, false, getRule().ele00ParserRuleCallSubrule1());
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$4(int entryPoint) throws Exception {
 		return consumeNonTerminal(subrule2Consumer, null, false, false, false, getRule().ele01ParserRuleCallSubrule2());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeNonTerminal(subrule3Consumer, null, false, false, false, getRule().ele1ParserRuleCallSubrule3());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRule2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRule2Consumer.java
index db694bf..49dbdfb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRule2Consumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRule2Consumer.java
@@ -52,7 +52,15 @@ public final class ConcreteTestLanguageOverridableParserRule2Consumer extends No
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -89,11 +97,28 @@ public final class ConcreteTestLanguageOverridableParserRule2Consumer extends No
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordOverriddenOtherElement(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001AssignmentName());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -101,11 +126,28 @@ public final class ConcreteTestLanguageOverridableParserRule2Consumer extends No
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordHyphenMinus(), null, false, false, getKeyword$7$Delimiter());
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentAge());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRuleConsumer.java
index 7e3addc..4604b80 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRuleConsumer.java
@@ -44,7 +44,15 @@ public final class ConcreteTestLanguageOverridableParserRuleConsumer extends Non
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class ConcreteTestLanguageOverridableParserRuleConsumer extends Non
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordOverriddenelement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java
index 047d660..74d18e2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java
@@ -44,7 +44,15 @@ public final class ConcreteTestLanguageRootRuleConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,18 +81,50 @@ public final class ConcreteTestLanguageRootRuleConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$4(int entryPoint) throws Exception {
 		return consumeNonTerminal(concreteParserRuleConsumer, null, false, false, false, getRule().ele000ParserRuleCallConcreteParserRule());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeNonTerminal(callOverridenParserRuleConsumer, null, false, false, false, getRule().ele001ParserRuleCallCallOverridenParserRule());
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$6(int entryPoint) throws Exception {
 		return consumeNonTerminal(callExtendedParserRuleConsumer, null, false, false, false, getRule().ele01ParserRuleCallCallExtendedParserRule());
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$7(int entryPoint) throws Exception {
 		return consumeNonTerminal(overridableParserRule2Consumer, null, false, false, false, getRule().ele1ParserRuleCallOverridableParserRule2());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule1Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule1Consumer.java
index a78b1e0..3a76256 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule1Consumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule1Consumer.java
@@ -47,7 +47,15 @@ public final class ConcreteTestLanguageSubrule1Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -77,11 +85,28 @@ public final class ConcreteTestLanguageSubrule1Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$3(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$3(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00KeywordSubrule1(), null, false, false, getKeyword$3$Delimiter());
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
@@ -89,7 +114,16 @@ public final class ConcreteTestLanguageSubrule1Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentSub1());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule2Consumer.java
index c0bc845..074bbd1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule2Consumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule2Consumer.java
@@ -49,7 +49,15 @@ public final class ConcreteTestLanguageSubrule2Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -79,11 +87,28 @@ public final class ConcreteTestLanguageSubrule2Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$3(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$3(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00KeywordSubrule3(), null, false, false, getKeyword$3$Delimiter());
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
@@ -91,7 +116,16 @@ public final class ConcreteTestLanguageSubrule2Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentSub2());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule3Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule3Consumer.java
index 276d83c..3fdaed9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule3Consumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule3Consumer.java
@@ -49,7 +49,15 @@ public final class ConcreteTestLanguageSubrule3Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -79,11 +87,28 @@ public final class ConcreteTestLanguageSubrule3Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$3(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$3(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00KeywordSubrule3(), null, false, false, getKeyword$3$Delimiter());
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
@@ -91,7 +116,16 @@ public final class ConcreteTestLanguageSubrule3Consumer extends NonTerminalConsu
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentSub1());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageElementConsumer.java
index c3884d2..84c96ff 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageElementConsumer.java
@@ -44,7 +44,15 @@ public final class InheritanceTestLanguageElementConsumer extends NonTerminalCon
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -67,11 +75,28 @@ public final class InheritanceTestLanguageElementConsumer extends NonTerminalCon
 	}
 
 	protected int consumeKeyword$2(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$2(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0KeywordElement(), null, false, false, getKeyword$2$Delimiter());
 	}
 
 	protected int consumeAssignment$3(int entryPoint) throws Exception {
-		return consumeRuleCall$4(entryPoint);
+		int result = doConsumeAssignment$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$3(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentName());
+		return result.getResult(consumeRuleCall$4(entryPoint));
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageModelConsumer.java
index bbb7874..718538f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageModelConsumer.java
@@ -52,7 +52,15 @@ public final class InheritanceTestLanguageModelConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -96,11 +104,28 @@ public final class InheritanceTestLanguageModelConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000KeywordModel(), null, false, false, getKeyword$5$Delimiter());
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentName());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -108,6 +133,14 @@ public final class InheritanceTestLanguageModelConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$8$Delimiter());
 	}
 
@@ -122,7 +155,8 @@ public final class InheritanceTestLanguageModelConsumer extends NonTerminalConsu
 	}
 
 	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentElements());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -130,6 +164,14 @@ public final class InheritanceTestLanguageModelConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
index 984e178..15e3d22 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
@@ -43,7 +43,15 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -66,7 +74,16 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum
 	}
 
 	protected int consumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		int result = doConsumeAssignment$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentName());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -84,7 +101,8 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentNameRefs());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java
index 63ca5b8..ac218cf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java
@@ -41,7 +41,16 @@ public final class MetamodelRefTestLanguageMyRuleConsumer extends NonTerminalCon
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentName());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
index a25c4e8..ec32f2c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
@@ -41,7 +41,16 @@ public final class MetamodelRefTestLanguageNameRefConsumer extends NonTerminalCo
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeCrossReference$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentRule());
+		return result.getResult(consumeCrossReference$2(entryPoint));
 	}
 
 	protected int consumeCrossReference$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
index b15cfa3..eb46c3f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
@@ -43,7 +43,15 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -66,7 +74,16 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer
 	}
 
 	protected int consumeAssignment$2(int entryPoint) throws Exception {
-		return consumeRuleCall$3(entryPoint);
+		int result = doConsumeAssignment$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$2(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0AssignmentName());
+		return result.getResult(consumeRuleCall$3(entryPoint));
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
@@ -84,7 +101,8 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer
 	}
 
 	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele1AssignmentNameRefs());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java
index c0d550f..1b34484 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java
@@ -41,7 +41,16 @@ public final class MultiGenMMTestLanguageNameRefConsumer extends NonTerminalCons
 	}
 
 	protected int consumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		int result = doConsumeAssignment$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentName());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java
index dc46f4c..dd5b953 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java
@@ -47,6 +47,9 @@ public final class DatatypeRulesTestLanguageCompositeModelConsumer extends NonTe
 			case 0:
 				announceNextStep();
 				result = doConsumeAssignment$1(nextEntryPoint());
+				while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+					result = doConsumeAssignment$1(nextEntryPoint());
+				}
 			case 1:
 				if (result == ConsumeResult.SUCCESS) {
 					marker.flush();
@@ -67,7 +70,8 @@ public final class DatatypeRulesTestLanguageCompositeModelConsumer extends NonTe
 	}
 
 	protected int doConsumeAssignment$1(int entryPoint) throws Exception {
-		return consumeRuleCall$2(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().eleAssignmentModel());
+		return result.getResult(consumeRuleCall$2(entryPoint));
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
index 443a680..fa2fe46 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
@@ -45,7 +45,15 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -64,7 +72,15 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons
 	}
 
 	protected int consumeGroup$2(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0Group());
+		int result = doConsumeGroup$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$2(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele0Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -87,14 +103,38 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons
 	}
 
 	protected int consumeKeyword$3(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$3(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00KeywordFullStop(), null, false, false, getKeyword$3$Delimiter());
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordFullStop(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeKeyword$5(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$5(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordFullStopFullStop(), null, false, false, getKeyword$5$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
index 4d43dfe..3609e81 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
@@ -47,7 +47,15 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -70,6 +78,14 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
 	}
 
 	protected int consumeRuleCall$2(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$2(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$2(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$2(int entryPoint) throws Exception {
 		return consumeTerminal(intConsumer, null, false, false, getRule().ele0LexerRuleCallINT(), getRuleCall$2$Delimiter());
 	}
 
@@ -85,7 +101,7 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
 	}
 
 	protected int doConsumeGroup$3(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -108,10 +124,26 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele10KeywordSolidus(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeTerminal(intConsumer, null, false, false, getRule().ele11LexerRuleCallINT(), getRuleCall$5$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
index 51837d5..6c297c0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
@@ -56,7 +56,15 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -100,7 +108,16 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeAssignment$5(int entryPoint) throws Exception {
-		return consumeRuleCall$6(entryPoint);
+		int result = doConsumeAssignment$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$5(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000AssignmentId());
+		return result.getResult(consumeRuleCall$6(entryPoint));
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
@@ -119,7 +136,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int doConsumeGroup$7(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0001Group());
+		final GroupResult result = createGroupResult(getRule().ele0001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -142,11 +159,28 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00010KeywordColon(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00011AssignmentValue());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -165,7 +199,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int doConsumeGroup$11(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -188,11 +222,28 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0010KeywordNumberSign(), null, false, false, getKeyword$12$Delimiter());
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0011AssignmentVector());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -211,7 +262,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int doConsumeGroup$15(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele01Group());
+		final GroupResult result = createGroupResult(getRule().ele01Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -234,11 +285,28 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeKeyword$16(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$16(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele010KeywordPlusSign(), null, false, false, getKeyword$16$Delimiter());
 	}
 
 	protected int consumeAssignment$17(int entryPoint) throws Exception {
-		return consumeRuleCall$18(entryPoint);
+		int result = doConsumeAssignment$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$17(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele011AssignmentDots());
+		return result.getResult(consumeRuleCall$18(entryPoint));
 	}
 
 	protected int consumeRuleCall$18(int entryPoint) throws Exception {
@@ -246,6 +314,14 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
 	}
 
 	protected int consumeKeyword$19(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$19(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$19$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
index 8a486cf..171921d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
@@ -47,7 +47,15 @@ public final class DatatypeRulesTestLanguageModelIdConsumer extends NonTerminalC
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -77,14 +85,38 @@ public final class DatatypeRulesTestLanguageModelIdConsumer extends NonTerminalC
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele00LexerRuleCallID(), getRuleCall$3$Delimiter());
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordFullStop(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeTerminal(idConsumer, null, false, false, getRule().ele1LexerRuleCallID(), getRuleCall$5$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
index 993670c..6bb97cb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
@@ -41,7 +41,15 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -71,14 +79,38 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer
 	}
 
 	protected int consumeRuleCall$3(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$3(int entryPoint) throws Exception {
 		return consumeNonTerminal(modelIdConsumer, null, false, true, false, getRule().ele00ParserRuleCallModelId());
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordFullStop(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeNonTerminal(modelIdConsumer, null, false, true, false, getRule().ele1ParserRuleCallModelId());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
index 23e846b..59208a2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
@@ -50,7 +50,15 @@ public final class DatatypeRulesTestLanguageVectorConsumer extends NonTerminalCo
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -87,18 +95,50 @@ public final class DatatypeRulesTestLanguageVectorConsumer extends NonTerminalCo
 	}
 
 	protected int consumeKeyword$4(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$4(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000KeywordLeftParenthesis(), null, false, false, getKeyword$4$Delimiter());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeTerminal(intConsumer, null, false, false, getRule().ele001LexerRuleCallINT(), getRuleCall$5$Delimiter());
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$6(int entryPoint) throws Exception {
 		return consumeTerminal(intConsumer, null, false, false, getRule().ele01LexerRuleCallINT(), getRuleCall$6$Delimiter());
 	}
 
 	protected int consumeKeyword$7(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$7(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordRightParenthesis(), null, false, false, getKeyword$7$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi
index 17803c5..3b63891 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi
@@ -582,47 +582,47 @@
               </groups>
             </groups>
             <groups xsi:type="xtext:Group">
-              <abstractTokens xsi:type="xtext:Assignment" feature="refObject" operator="=">
+              <abstractTokens xsi:type="xtext:Assignment" feature="import" operator="=">
                 <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0">
                   <type metamodel="/0/@metamodelDeclarations.0">
-                    <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedObject"/>
+                    <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/>
                   </type>
                 </terminal>
               </abstractTokens>
+              <abstractTokens xsi:type="xtext:Assignment" feature="impFrag" operator="=">
+                <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.21"/>
+              </abstractTokens>
+            </groups>
+          </groups>
+          <groups xsi:type="xtext:Group">
+            <abstractTokens xsi:type="xtext:Assignment" feature="refObject" operator="=">
+              <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0">
+                <type metamodel="/0/@metamodelDeclarations.0">
+                  <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedObject"/>
+                </type>
+              </terminal>
+            </abstractTokens>
+            <abstractTokens xsi:type="xtext:Group" cardinality="?">
+              <abstractTokens xsi:type="xtext:Group">
+                <abstractTokens xsi:type="xtext:Keyword" value="."/>
+                <abstractTokens xsi:type="xtext:Assignment" feature="refFeature" operator="=">
+                  <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
+                </abstractTokens>
+              </abstractTokens>
               <abstractTokens xsi:type="xtext:Group" cardinality="?">
                 <abstractTokens xsi:type="xtext:Group">
-                  <abstractTokens xsi:type="xtext:Keyword" value="."/>
-                  <abstractTokens xsi:type="xtext:Assignment" feature="refFeature" operator="=">
-                    <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
-                  </abstractTokens>
-                </abstractTokens>
-                <abstractTokens xsi:type="xtext:Group" cardinality="?">
-                  <abstractTokens xsi:type="xtext:Group">
-                    <abstractTokens xsi:type="xtext:Keyword" value="["/>
-                    <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="=">
-                      <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/>
-                    </abstractTokens>
+                  <abstractTokens xsi:type="xtext:Keyword" value="["/>
+                  <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="=">
+                    <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.1"/>
                   </abstractTokens>
-                  <abstractTokens xsi:type="xtext:Keyword" value="]"/>
                 </abstractTokens>
+                <abstractTokens xsi:type="xtext:Keyword" value="]"/>
               </abstractTokens>
-            </groups>
-          </groups>
-          <groups xsi:type="xtext:Assignment" feature="newObject" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.18"/>
+            </abstractTokens>
           </groups>
         </groups>
-        <groups xsi:type="xtext:Group">
-          <abstractTokens xsi:type="xtext:Assignment" feature="import" operator="=">
-            <terminal xsi:type="xtext:CrossReference" rule="/1/@rules.0">
-              <type metamodel="/0/@metamodelDeclarations.0">
-                <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/>
-              </type>
-            </terminal>
-          </abstractTokens>
-          <abstractTokens xsi:type="xtext:Assignment" feature="impFrag" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.21"/>
-          </abstractTokens>
+        <groups xsi:type="xtext:Assignment" feature="newObject" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.18"/>
         </groups>
       </alternatives>
     </rules>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parseTreeConstruction/EpatchTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parseTreeConstruction/EpatchTestLanguageParsetreeConstructor.java
index 98956d8..1d92129 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parseTreeConstruction/EpatchTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parseTreeConstruction/EpatchTestLanguageParsetreeConstructor.java
@@ -5888,7 +5888,7 @@ protected class SingleAssignmentValue_Alternatives extends AlternativesToken {
 
 	@Override	
 	protected Solution createSolution() {
-		AbstractToken t = (first) ? new SingleAssignmentValue_1_Group(current, this) : new SingleAssignmentValue_0_Alternatives(current, this);
+		AbstractToken t = (first) ? new SingleAssignmentValue_1_Assignment_newObject(current, this) : new SingleAssignmentValue_0_Alternatives(current, this);
 		Solution s = t.firstSolution();
 		if(s == null && activateNextSolution()) s = createSolution();
 		if(s == null) return null;
@@ -5911,7 +5911,7 @@ protected class SingleAssignmentValue_0_Alternatives extends AlternativesToken {
 
 	@Override	
 	protected Solution createSolution() {
-		AbstractToken t = (first) ? new SingleAssignmentValue_0_1_Assignment_newObject(current, this) : new SingleAssignmentValue_0_0_Alternatives(current, this);
+		AbstractToken t = (first) ? new SingleAssignmentValue_0_1_Group(current, this) : new SingleAssignmentValue_0_0_Alternatives(current, this);
 		Solution s = t.firstSolution();
 		if(s == null && activateNextSolution()) s = createSolution();
 		if(s == null) return null;
@@ -6033,9 +6033,9 @@ protected class SingleAssignmentValue_0_0_1_Group extends GroupToken {
 		
 	@Override
 	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_0_0_1_1_Group(current, this).firstSolution();
+		Solution s1 = new SingleAssignmentValue_0_0_1_1_Assignment_impFrag(current, this).firstSolution();
 		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_0_0_1_0_Assignment_refObject(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			Solution s2 = new SingleAssignmentValue_0_0_1_0_Assignment_import(s1.getCurrent(), s1.getPredecessor()).firstSolution();
 			if(s2 == null) {
 				s1 = s1.getPredecessor().nextSolution(this,s1);
 				if(s1 == null) return null;
@@ -6050,15 +6050,100 @@ protected class SingleAssignmentValue_0_0_1_Group extends GroupToken {
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_0_Assignment_refObject extends AssignmentToken  {
+protected class SingleAssignmentValue_0_0_1_0_Assignment_import extends AssignmentToken  {
 	
-	public SingleAssignmentValue_0_0_1_0_Assignment_refObject(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_0_1_0_Assignment_import(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele0010AssignmentRefObject();
+		return grammarAccess.prSingleAssignmentValue().ele0010AssignmentImport();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		if((value = current.getConsumable("import",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("import");
+		if(value instanceof EObject) { // xtext::CrossReference
+			IInstanceDescription param = getDescr((EObject)value);
+			if(param.isInstanceOf(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringImport().getType().getType())) {
+				type = AssignmentType.CR;
+				element = grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringImport(); 
+				return new Solution(obj);
+			}
+		}
+		return null;
+	}
+}
+
+// not supported
+protected class SingleAssignmentValue_0_0_1_1_Assignment_impFrag extends AssignmentToken  {
+	
+	public SingleAssignmentValue_0_0_1_1_Assignment_impFrag(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.prSingleAssignmentValue().ele0011AssignmentImpFrag();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		if((value = current.getConsumable("impFrag",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("impFrag");
+		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
+			type = AssignmentType.LRC;
+			element = grammarAccess.prSingleAssignmentValue().ele00110LexerRuleCallFRAGMENT();
+			return new Solution(obj);
+		}
+		return null;
+	}
+}
+
+
+
+// not supported
+protected class SingleAssignmentValue_0_1_Group extends GroupToken {
+	
+	public SingleAssignmentValue_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.prSingleAssignmentValue().ele01Group();
+	}
+		
+	@Override
+	protected Solution createSolution() {	
+		Solution s1 = new SingleAssignmentValue_0_1_1_Group(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new SingleAssignmentValue_0_1_0_Assignment_refObject(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this,s1);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// not supported
+protected class SingleAssignmentValue_0_1_0_Assignment_refObject extends AssignmentToken  {
+	
+	public SingleAssignmentValue_0_1_0_Assignment_refObject(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.prSingleAssignmentValue().ele010AssignmentRefObject();
 	}
 	
 	@Override
@@ -6067,9 +6152,9 @@ protected class SingleAssignmentValue_0_0_1_0_Assignment_refObject extends Assig
 		IInstanceDescription obj = current.cloneAndConsume("refObject");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringNamedObject().getType().getType())) {
+			if(param.isInstanceOf(grammarAccess.prSingleAssignmentValue().ele0100CrossReferenceEStringNamedObject().getType().getType())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringNamedObject(); 
+				element = grammarAccess.prSingleAssignmentValue().ele0100CrossReferenceEStringNamedObject(); 
 				return new Solution(obj);
 			}
 		}
@@ -6078,22 +6163,22 @@ protected class SingleAssignmentValue_0_0_1_0_Assignment_refObject extends Assig
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_Group extends GroupToken {
+protected class SingleAssignmentValue_0_1_1_Group extends GroupToken {
 	
-	public SingleAssignmentValue_0_0_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele0011Group();
+		return grammarAccess.prSingleAssignmentValue().ele011Group();
 	}
 		
 	@Override
 	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_0_0_1_1_1_Group(current, this).firstSolution();
+		Solution s1 = new SingleAssignmentValue_0_1_1_1_Group(current, this).firstSolution();
 		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_0_0_1_1_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			Solution s2 = new SingleAssignmentValue_0_1_1_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
 			if(s2 == null) {
 				s1 = s1.getPredecessor().nextSolution(this,s1);
 				if(s1 == null) return null;
@@ -6108,22 +6193,22 @@ protected class SingleAssignmentValue_0_0_1_1_Group extends GroupToken {
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_0_Group extends GroupToken {
+protected class SingleAssignmentValue_0_1_1_0_Group extends GroupToken {
 	
-	public SingleAssignmentValue_0_0_1_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele00110Group();
+		return grammarAccess.prSingleAssignmentValue().ele0110Group();
 	}
 		
 	@Override
 	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_0_0_1_1_0_1_Assignment_refFeature(current, this).firstSolution();
+		Solution s1 = new SingleAssignmentValue_0_1_1_0_1_Assignment_refFeature(current, this).firstSolution();
 		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_0_0_1_1_0_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			Solution s2 = new SingleAssignmentValue_0_1_1_0_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
 			if(s2 == null) {
 				s1 = s1.getPredecessor().nextSolution(this,s1);
 				if(s1 == null) return null;
@@ -6138,27 +6223,27 @@ protected class SingleAssignmentValue_0_0_1_1_0_Group extends GroupToken {
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_0_0_Keyword extends KeywordToken  {
+protected class SingleAssignmentValue_0_1_1_0_0_Keyword extends KeywordToken  {
 	
-	public SingleAssignmentValue_0_0_1_1_0_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_0_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele001100KeywordFullStop();
+		return grammarAccess.prSingleAssignmentValue().ele01100KeywordFullStop();
 	}	
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_0_1_Assignment_refFeature extends AssignmentToken  {
+protected class SingleAssignmentValue_0_1_1_0_1_Assignment_refFeature extends AssignmentToken  {
 	
-	public SingleAssignmentValue_0_0_1_1_0_1_Assignment_refFeature(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_0_1_Assignment_refFeature(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele001101AssignmentRefFeature();
+		return grammarAccess.prSingleAssignmentValue().ele01101AssignmentRefFeature();
 	}
 	
 	@Override
@@ -6167,7 +6252,7 @@ protected class SingleAssignmentValue_0_0_1_1_0_1_Assignment_refFeature extends
 		IInstanceDescription obj = current.cloneAndConsume("refFeature");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prSingleAssignmentValue().ele0011010LexerRuleCallID();
+			element = grammarAccess.prSingleAssignmentValue().ele011010LexerRuleCallID();
 			return new Solution(obj);
 		}
 		return null;
@@ -6176,22 +6261,22 @@ protected class SingleAssignmentValue_0_0_1_1_0_1_Assignment_refFeature extends
 
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_1_Group extends GroupToken {
+protected class SingleAssignmentValue_0_1_1_1_Group extends GroupToken {
 	
-	public SingleAssignmentValue_0_0_1_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele00111Group();
+		return grammarAccess.prSingleAssignmentValue().ele0111Group();
 	}
 		
 	@Override
 	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_0_0_1_1_1_1_Keyword(current, this).firstSolution();
+		Solution s1 = new SingleAssignmentValue_0_1_1_1_1_Keyword(current, this).firstSolution();
 		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_0_0_1_1_1_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			Solution s2 = new SingleAssignmentValue_0_1_1_1_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
 			if(s2 == null) {
 				s1 = s1.getPredecessor().nextSolution(this,s1);
 				if(s1 == null) return null;
@@ -6206,22 +6291,22 @@ protected class SingleAssignmentValue_0_0_1_1_1_Group extends GroupToken {
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_1_0_Group extends GroupToken {
+protected class SingleAssignmentValue_0_1_1_1_0_Group extends GroupToken {
 	
-	public SingleAssignmentValue_0_0_1_1_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele001110Group();
+		return grammarAccess.prSingleAssignmentValue().ele01110Group();
 	}
 		
 	@Override
 	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_0_0_1_1_1_0_1_Assignment_refIndex(current, this).firstSolution();
+		Solution s1 = new SingleAssignmentValue_0_1_1_1_0_1_Assignment_refIndex(current, this).firstSolution();
 		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_0_0_1_1_1_0_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			Solution s2 = new SingleAssignmentValue_0_1_1_1_0_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
 			if(s2 == null) {
 				s1 = s1.getPredecessor().nextSolution(this,s1);
 				if(s1 == null) return null;
@@ -6236,27 +6321,27 @@ protected class SingleAssignmentValue_0_0_1_1_1_0_Group extends GroupToken {
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_1_0_0_Keyword extends KeywordToken  {
+protected class SingleAssignmentValue_0_1_1_1_0_0_Keyword extends KeywordToken  {
 	
-	public SingleAssignmentValue_0_0_1_1_1_0_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_1_0_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele0011100KeywordLeftSquareBracket();
+		return grammarAccess.prSingleAssignmentValue().ele011100KeywordLeftSquareBracket();
 	}	
 }
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_1_0_1_Assignment_refIndex extends AssignmentToken  {
+protected class SingleAssignmentValue_0_1_1_1_0_1_Assignment_refIndex extends AssignmentToken  {
 	
-	public SingleAssignmentValue_0_0_1_1_1_0_1_Assignment_refIndex(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_1_0_1_Assignment_refIndex(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele0011101AssignmentRefIndex();
+		return grammarAccess.prSingleAssignmentValue().ele011101AssignmentRefIndex();
 	}
 	
 	@Override
@@ -6265,7 +6350,7 @@ protected class SingleAssignmentValue_0_0_1_1_1_0_1_Assignment_refIndex extends
 		IInstanceDescription obj = current.cloneAndConsume("refIndex");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prSingleAssignmentValue().ele00111010LexerRuleCallINT();
+			element = grammarAccess.prSingleAssignmentValue().ele0111010LexerRuleCallINT();
 			return new Solution(obj);
 		}
 		return null;
@@ -6274,14 +6359,14 @@ protected class SingleAssignmentValue_0_0_1_1_1_0_1_Assignment_refIndex extends
 
 
 // not supported
-protected class SingleAssignmentValue_0_0_1_1_1_1_Keyword extends KeywordToken  {
+protected class SingleAssignmentValue_0_1_1_1_1_Keyword extends KeywordToken  {
 	
-	public SingleAssignmentValue_0_0_1_1_1_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_0_1_1_1_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele001111KeywordRightSquareBracket();
+		return grammarAccess.prSingleAssignmentValue().ele01111KeywordRightSquareBracket();
 	}	
 }
 
@@ -6290,15 +6375,15 @@ protected class SingleAssignmentValue_0_0_1_1_1_1_Keyword extends KeywordToken
 
 
 // not supported
-protected class SingleAssignmentValue_0_1_Assignment_newObject extends AssignmentToken  {
+protected class SingleAssignmentValue_1_Assignment_newObject extends AssignmentToken  {
 	
-	public SingleAssignmentValue_0_1_Assignment_newObject(IInstanceDescription curr, AbstractToken pred) {
+	public SingleAssignmentValue_1_Assignment_newObject(IInstanceDescription curr, AbstractToken pred) {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele01AssignmentNewObject();
+		return grammarAccess.prSingleAssignmentValue().ele1AssignmentNewObject();
 	}
 	
 	@Override
@@ -6323,91 +6408,6 @@ protected class SingleAssignmentValue_0_1_Assignment_newObject extends Assignmen
 }
 
 
-// not supported
-protected class SingleAssignmentValue_1_Group extends GroupToken {
-	
-	public SingleAssignmentValue_1_Group(IInstanceDescription curr, AbstractToken pred) {
-		super(curr, pred, !IS_MANY, IS_REQUIRED);
-	}
-	
-	@Override
-	public Group getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele1Group();
-	}
-		
-	@Override
-	protected Solution createSolution() {	
-		Solution s1 = new SingleAssignmentValue_1_1_Assignment_impFrag(current, this).firstSolution();
-		while(s1 != null) {
-			Solution s2 = new SingleAssignmentValue_1_0_Assignment_import(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-			if(s2 == null) {
-				s1 = s1.getPredecessor().nextSolution(this,s1);
-				if(s1 == null) return null;
-			} else {
-				last = s2.getPredecessor();
-				return s2;
-			}
-		}
-		return null;
-		
-	}
-}
-
-// not supported
-protected class SingleAssignmentValue_1_0_Assignment_import extends AssignmentToken  {
-	
-	public SingleAssignmentValue_1_0_Assignment_import(IInstanceDescription curr, AbstractToken pred) {
-		super(curr, pred, !IS_MANY, IS_REQUIRED);
-	}
-	
-	@Override
-	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele10AssignmentImport();
-	}
-	
-	@Override
-	protected Solution createSolution() {
-		if((value = current.getConsumable("import",IS_REQUIRED)) == null) return null;
-		IInstanceDescription obj = current.cloneAndConsume("import");
-		if(value instanceof EObject) { // xtext::CrossReference
-			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prSingleAssignmentValue().ele100CrossReferenceEStringImport().getType().getType())) {
-				type = AssignmentType.CR;
-				element = grammarAccess.prSingleAssignmentValue().ele100CrossReferenceEStringImport(); 
-				return new Solution(obj);
-			}
-		}
-		return null;
-	}
-}
-
-// not supported
-protected class SingleAssignmentValue_1_1_Assignment_impFrag extends AssignmentToken  {
-	
-	public SingleAssignmentValue_1_1_Assignment_impFrag(IInstanceDescription curr, AbstractToken pred) {
-		super(curr, pred, !IS_MANY, IS_REQUIRED);
-	}
-	
-	@Override
-	public Assignment getGrammarElement() {
-		return grammarAccess.prSingleAssignmentValue().ele11AssignmentImpFrag();
-	}
-	
-	@Override
-	protected Solution createSolution() {
-		if((value = current.getConsumable("impFrag",IS_REQUIRED)) == null) return null;
-		IInstanceDescription obj = current.cloneAndConsume("impFrag");
-		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
-			type = AssignmentType.LRC;
-			element = grammarAccess.prSingleAssignmentValue().ele110LexerRuleCallFRAGMENT();
-			return new Solution(obj);
-		}
-		return null;
-	}
-}
-
-
-
 /************ end Rule SingleAssignmentValue ****************/
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g
index 4d5910e..5c15d49 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g
@@ -1895,20 +1895,57 @@ ruleSingleAssignmentValue returns [EObject current=null]
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringNamedObject(), "refObject"); 
+		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringImport(), "import"); 
+	}
+
+		// TODO assign feature to currentNode
+	
+)(	
+	
+	    lv_impFrag_3=	RULE_FRAGMENT
+	{
+		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00110LexerRuleCallFRAGMENT(), "impFrag"); 
+	}
+ 
+	    {
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        try {
+	       		set($current, "impFrag", lv_impFrag_3, "FRAGMENT", lastConsumedNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	    }
+	
+)))
+    |((	
+	
+		
+		{
+			if ($current==null) {
+	            $current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+        }
+	RULE_ID
+	{
+		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0100CrossReferenceEStringNamedObject(), "refObject"); 
 	}
 
 		// TODO assign feature to currentNode
 	
 )(('.' 
     {
-        createLeafNode(grammarAccess.prSingleAssignmentValue().ele001100KeywordFullStop(), null); 
+        createLeafNode(grammarAccess.prSingleAssignmentValue().ele01100KeywordFullStop(), null); 
     }
 (	
 	
-	    lv_refFeature_4=	RULE_ID
+	    lv_refFeature_6=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0011010LexerRuleCallID(), "refFeature"); 
+		createLeafNode(grammarAccess.prSingleAssignmentValue().ele011010LexerRuleCallID(), "refFeature"); 
 	}
  
 	    {
@@ -1918,7 +1955,7 @@ ruleSingleAssignmentValue returns [EObject current=null]
 	        }
 	        
 	        try {
-	       		set($current, "refFeature", lv_refFeature_4, "ID", lastConsumedNode);
+	       		set($current, "refFeature", lv_refFeature_6, "ID", lastConsumedNode);
 	        } catch (ValueConverterException vce) {
 				handleValueConverterException(vce);
 	        }
@@ -1926,13 +1963,13 @@ ruleSingleAssignmentValue returns [EObject current=null]
 	
 ))(('[' 
     {
-        createLeafNode(grammarAccess.prSingleAssignmentValue().ele0011100KeywordLeftSquareBracket(), null); 
+        createLeafNode(grammarAccess.prSingleAssignmentValue().ele011100KeywordLeftSquareBracket(), null); 
     }
 (	
 	
-	    lv_refIndex_6=	RULE_INT
+	    lv_refIndex_8=	RULE_INT
 	{
-		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00111010LexerRuleCallINT(), "refIndex"); 
+		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0111010LexerRuleCallINT(), "refIndex"); 
 	}
  
 	    {
@@ -1942,7 +1979,7 @@ ruleSingleAssignmentValue returns [EObject current=null]
 	        }
 	        
 	        try {
-	       		set($current, "refIndex", lv_refIndex_6, "INT", lastConsumedNode);
+	       		set($current, "refIndex", lv_refIndex_8, "INT", lastConsumedNode);
 	        } catch (ValueConverterException vce) {
 				handleValueConverterException(vce);
 	        }
@@ -1950,16 +1987,16 @@ ruleSingleAssignmentValue returns [EObject current=null]
 	
 ))']' 
     {
-        createLeafNode(grammarAccess.prSingleAssignmentValue().ele001111KeywordRightSquareBracket(), null); 
+        createLeafNode(grammarAccess.prSingleAssignmentValue().ele01111KeywordRightSquareBracket(), null); 
     }
 )?)?))
     |(	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSingleAssignmentValue().ele010ParserRuleCallCreatedObject(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.prSingleAssignmentValue().ele10ParserRuleCallCreatedObject(), currentNode); 
 	    }
-	    lv_newObject_8=ruleCreatedObject 
+	    lv_newObject_10=ruleCreatedObject 
 	    {
 	        if ($current==null) {
 	            $current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
@@ -1967,51 +2004,14 @@ ruleSingleAssignmentValue returns [EObject current=null]
 	        }
 	        
 	        try {
-	       		set($current, "newObject", lv_newObject_8, "CreatedObject", currentNode);
+	       		set($current, "newObject", lv_newObject_10, "CreatedObject", currentNode);
 	        } catch (ValueConverterException vce) {
 				handleValueConverterException(vce);
 	        }
 	        currentNode = currentNode.getParent();
 	    }
 	
-))
-    |((	
-	
-		
-		{
-			if ($current==null) {
-	            $current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-	            associateNodeWithAstElement(currentNode, $current);
-	        }
-        }
-	RULE_ID
-	{
-		createLeafNode(grammarAccess.prSingleAssignmentValue().ele100CrossReferenceEStringImport(), "import"); 
-	}
-
-		// TODO assign feature to currentNode
-	
-)(	
-	
-	    lv_impFrag_10=	RULE_FRAGMENT
-	{
-		createLeafNode(grammarAccess.prSingleAssignmentValue().ele110LexerRuleCallFRAGMENT(), "impFrag"); 
-	}
- 
-	    {
-	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-	            associateNodeWithAstElement(currentNode, $current);
-	        }
-	        
-	        try {
-	       		set($current, "impFrag", lv_impFrag_10, "FRAGMENT", lastConsumedNode);
-	        } catch (ValueConverterException vce) {
-				handleValueConverterException(vce);
-	        }
-	    }
-	
-)));
+));
 
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java
index 22e258a..b4c0f63 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java
@@ -4097,94 +4097,94 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
 
 
     // $ANTLR start ruleSingleAssignmentValue
-    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1838:1: ruleSingleAssignmentValue returns [EObject current=null] : ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) ) ;
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1838:1: ruleSingleAssignmentValue returns [EObject current=null] : ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_10= ruleCreatedObject ) ) ;
     public final EObject ruleSingleAssignmentValue() throws RecognitionException {
         EObject current = null;
 
         Token lv_keyword_0=null;
         Token lv_value_1=null;
-        Token lv_refFeature_4=null;
-        Token lv_refIndex_6=null;
-        Token lv_impFrag_10=null;
-        EObject lv_newObject_8 = null;
+        Token lv_impFrag_3=null;
+        Token lv_refFeature_6=null;
+        Token lv_refIndex_8=null;
+        EObject lv_newObject_10 = null;
 
 
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1843:6: ( ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) ) )
-            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1843:6: ( ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_10= ruleCreatedObject ) ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_10= ruleCreatedObject ) )
             {
-            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_10= ruleCreatedObject ) )
             int alt39=2;
             int LA39_0 = input.LA(1);
 
-            if ( (LA39_0==RULE_STRING||(LA39_0>=33 && LA39_0<=35)) ) {
+            if ( ((LA39_0>=RULE_ID && LA39_0<=RULE_STRING)||LA39_0==33) ) {
                 alt39=1;
             }
-            else if ( (LA39_0==RULE_ID) ) {
-                int LA39_2 = input.LA(2);
-
-                if ( (LA39_2==RULE_FRAGMENT) ) {
-                    alt39=2;
-                }
-                else if ( (LA39_2==EOF||LA39_2==19||LA39_2==24||LA39_2==28) ) {
-                    alt39=1;
-                }
-                else {
-                    NoViableAltException nvae =
-                        new NoViableAltException("1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) )", 39, 2, input);
-
-                    throw nvae;
-                }
+            else if ( ((LA39_0>=34 && LA39_0<=35)) ) {
+                alt39=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) ) | ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) ) )", 39, 0, input);
+                    new NoViableAltException("1844:1: ( ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_10= ruleCreatedObject ) )", 39, 0, input);
 
                 throw nvae;
             }
             switch (alt39) {
                 case 1 :
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) )
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) )
                     {
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) )
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) )
                     int alt38=2;
                     int LA38_0 = input.LA(1);
 
-                    if ( ((LA38_0>=RULE_ID && LA38_0<=RULE_STRING)||LA38_0==33) ) {
+                    if ( (LA38_0==RULE_STRING||LA38_0==33) ) {
                         alt38=1;
                     }
-                    else if ( ((LA38_0>=34 && LA38_0<=35)) ) {
-                        alt38=2;
+                    else if ( (LA38_0==RULE_ID) ) {
+                        int LA38_2 = input.LA(2);
+
+                        if ( (LA38_2==RULE_FRAGMENT) ) {
+                            alt38=1;
+                        }
+                        else if ( (LA38_2==EOF||LA38_2==19||LA38_2==24||LA38_2==28) ) {
+                            alt38=2;
+                        }
+                        else {
+                            NoViableAltException nvae =
+                                new NoViableAltException("1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) )", 38, 2, input);
+
+                            throw nvae;
+                        }
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) ) | (lv_newObject_8= ruleCreatedObject ) )", 38, 0, input);
+                            new NoViableAltException("1844:2: ( ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? ) )", 38, 0, input);
 
                         throw nvae;
                     }
                     switch (alt38) {
                         case 1 :
-                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) )
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) )
                             {
-                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) )
-                            int alt37=2;
-                            int LA37_0 = input.LA(1);
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) )
+                            int alt35=2;
+                            int LA35_0 = input.LA(1);
 
-                            if ( (LA37_0==RULE_STRING||LA37_0==33) ) {
-                                alt37=1;
+                            if ( (LA35_0==RULE_STRING||LA35_0==33) ) {
+                                alt35=1;
                             }
-                            else if ( (LA37_0==RULE_ID) ) {
-                                alt37=2;
+                            else if ( (LA35_0==RULE_ID) ) {
+                                alt35=2;
                             }
                             else {
                                 NoViableAltException nvae =
-                                    new NoViableAltException("1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? ) )", 37, 0, input);
+                                    new NoViableAltException("1844:3: ( ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) ) | ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) ) )", 35, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt37) {
+                            switch (alt35) {
                                 case 1 :
                                     // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1844:4: ( (lv_keyword_0= 'null' ) | (lv_value_1= RULE_STRING ) )
                                     {
@@ -4270,10 +4270,10 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
                                     }
                                     break;
                                 case 2 :
-                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:6: ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? )
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:6: ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) )
                                     {
-                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:6: ( ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )? )
-                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:7: ( RULE_ID ) ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )?
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:6: ( ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT ) )
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:7: ( RULE_ID ) (lv_impFrag_3= RULE_FRAGMENT )
                                     {
                                     // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1887:7: ( RULE_ID )
                                     // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1890:3: RULE_ID
@@ -4286,36 +4286,137 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
                                             
                                     match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSingleAssignmentValue3977); 
 
-                                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringNamedObject(), "refObject"); 
+                                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00100CrossReferenceEStringImport(), "import"); 
+                                    	
+
+                                    }
+
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1903:2: (lv_impFrag_3= RULE_FRAGMENT )
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1905:6: lv_impFrag_3= RULE_FRAGMENT
+                                    {
+                                    lv_impFrag_3=(Token)input.LT(1);
+                                    match(input,RULE_FRAGMENT,FOLLOW_RULE_FRAGMENT_in_ruleSingleAssignmentValue4002); 
+
+                                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00110LexerRuleCallFRAGMENT(), "impFrag"); 
+                                    	
+
+                                    	        if (current==null) {
+                                    	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
+                                    	            associateNodeWithAstElement(currentNode, current);
+                                    	        }
+                                    	        
+                                    	        try {
+                                    	       		set(current, "impFrag", lv_impFrag_3, "FRAGMENT", lastConsumedNode);
+                                    	        } catch (ValueConverterException vce) {
+                                    				handleValueConverterException(vce);
+                                    	        }
+                                    	    
+
+                                    }
+
+
+                                    }
+
+
+                                    }
+                                    break;
+
+                            }
+
+
+                            }
+                            break;
+                        case 2 :
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1924:6: ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? )
+                            {
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1924:6: ( ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )? )
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1924:7: ( RULE_ID ) ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )?
+                            {
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1924:7: ( RULE_ID )
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1927:3: RULE_ID
+                            {
+
+                            			if (current==null) {
+                            	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
+                            	            associateNodeWithAstElement(currentNode, current);
+                            	        }
+                                    
+                            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4041); 
+
+                            		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0100CrossReferenceEStringNamedObject(), "refObject"); 
+                            	
+
+                            }
+
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1940:2: ( ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )? )?
+                            int alt37=2;
+                            int LA37_0 = input.LA(1);
+
+                            if ( (LA37_0==19) ) {
+                                alt37=1;
+                            }
+                            switch (alt37) {
+                                case 1 :
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1940:3: ( '.' (lv_refFeature_6= RULE_ID ) ) ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )?
+                                    {
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1940:3: ( '.' (lv_refFeature_6= RULE_ID ) )
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1940:4: '.' (lv_refFeature_6= RULE_ID )
+                                    {
+                                    match(input,19,FOLLOW_19_in_ruleSingleAssignmentValue4055); 
+
+                                            createLeafNode(grammarAccess.prSingleAssignmentValue().ele01100KeywordFullStop(), null); 
+                                        
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1944:1: (lv_refFeature_6= RULE_ID )
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1946:6: lv_refFeature_6= RULE_ID
+                                    {
+                                    lv_refFeature_6=(Token)input.LT(1);
+                                    match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4077); 
+
+                                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele011010LexerRuleCallID(), "refFeature"); 
                                     	
 
+                                    	        if (current==null) {
+                                    	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
+                                    	            associateNodeWithAstElement(currentNode, current);
+                                    	        }
+                                    	        
+                                    	        try {
+                                    	       		set(current, "refFeature", lv_refFeature_6, "ID", lastConsumedNode);
+                                    	        } catch (ValueConverterException vce) {
+                                    				handleValueConverterException(vce);
+                                    	        }
+                                    	    
+
+                                    }
+
+
                                     }
 
-                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1903:2: ( ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )? )?
+                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1964:3: ( ( '[' (lv_refIndex_8= RULE_INT ) ) ']' )?
                                     int alt36=2;
                                     int LA36_0 = input.LA(1);
 
-                                    if ( (LA36_0==19) ) {
+                                    if ( (LA36_0==29) ) {
                                         alt36=1;
                                     }
                                     switch (alt36) {
                                         case 1 :
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1903:3: ( '.' (lv_refFeature_4= RULE_ID ) ) ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )?
+                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1964:4: ( '[' (lv_refIndex_8= RULE_INT ) ) ']'
                                             {
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1903:3: ( '.' (lv_refFeature_4= RULE_ID ) )
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1903:4: '.' (lv_refFeature_4= RULE_ID )
+                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1964:4: ( '[' (lv_refIndex_8= RULE_INT ) )
+                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1964:5: '[' (lv_refIndex_8= RULE_INT )
                                             {
-                                            match(input,19,FOLLOW_19_in_ruleSingleAssignmentValue3991); 
+                                            match(input,29,FOLLOW_29_in_ruleSingleAssignmentValue4097); 
 
-                                                    createLeafNode(grammarAccess.prSingleAssignmentValue().ele001100KeywordFullStop(), null); 
+                                                    createLeafNode(grammarAccess.prSingleAssignmentValue().ele011100KeywordLeftSquareBracket(), null); 
                                                 
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1907:1: (lv_refFeature_4= RULE_ID )
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1909:6: lv_refFeature_4= RULE_ID
+                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1968:1: (lv_refIndex_8= RULE_INT )
+                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1970:6: lv_refIndex_8= RULE_INT
                                             {
-                                            lv_refFeature_4=(Token)input.LT(1);
-                                            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4013); 
+                                            lv_refIndex_8=(Token)input.LT(1);
+                                            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSingleAssignmentValue4119); 
 
-                                            		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0011010LexerRuleCallID(), "refFeature"); 
+                                            		createLeafNode(grammarAccess.prSingleAssignmentValue().ele0111010LexerRuleCallINT(), "refIndex"); 
                                             	
 
                                             	        if (current==null) {
@@ -4324,7 +4425,7 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
                                             	        }
                                             	        
                                             	        try {
-                                            	       		set(current, "refFeature", lv_refFeature_4, "ID", lastConsumedNode);
+                                            	       		set(current, "refIndex", lv_refIndex_8, "INT", lastConsumedNode);
                                             	        } catch (ValueConverterException vce) {
                                             				handleValueConverterException(vce);
                                             	        }
@@ -4335,60 +4436,10 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
 
                                             }
 
-                                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1927:3: ( ( '[' (lv_refIndex_6= RULE_INT ) ) ']' )?
-                                            int alt35=2;
-                                            int LA35_0 = input.LA(1);
-
-                                            if ( (LA35_0==29) ) {
-                                                alt35=1;
-                                            }
-                                            switch (alt35) {
-                                                case 1 :
-                                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1927:4: ( '[' (lv_refIndex_6= RULE_INT ) ) ']'
-                                                    {
-                                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1927:4: ( '[' (lv_refIndex_6= RULE_INT ) )
-                                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1927:5: '[' (lv_refIndex_6= RULE_INT )
-                                                    {
-                                                    match(input,29,FOLLOW_29_in_ruleSingleAssignmentValue4033); 
-
-                                                            createLeafNode(grammarAccess.prSingleAssignmentValue().ele0011100KeywordLeftSquareBracket(), null); 
-                                                        
-                                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1931:1: (lv_refIndex_6= RULE_INT )
-                                                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1933:6: lv_refIndex_6= RULE_INT
-                                                    {
-                                                    lv_refIndex_6=(Token)input.LT(1);
-                                                    match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSingleAssignmentValue4055); 
-
-                                                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele00111010LexerRuleCallINT(), "refIndex"); 
-                                                    	
-
-                                                    	        if (current==null) {
-                                                    	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-                                                    	            associateNodeWithAstElement(currentNode, current);
-                                                    	        }
-                                                    	        
-                                                    	        try {
-                                                    	       		set(current, "refIndex", lv_refIndex_6, "INT", lastConsumedNode);
-                                                    	        } catch (ValueConverterException vce) {
-                                                    				handleValueConverterException(vce);
-                                                    	        }
-                                                    	    
-
-                                                    }
-
-
-                                                    }
-
-                                                    match(input,31,FOLLOW_31_in_ruleSingleAssignmentValue4073); 
-
-                                                            createLeafNode(grammarAccess.prSingleAssignmentValue().ele001111KeywordRightSquareBracket(), null); 
-                                                        
-
-                                                    }
-                                                    break;
-
-                                            }
+                                            match(input,31,FOLLOW_31_in_ruleSingleAssignmentValue4137); 
 
+                                                    createLeafNode(grammarAccess.prSingleAssignmentValue().ele01111KeywordRightSquareBracket(), null); 
+                                                
 
                                             }
                                             break;
@@ -4397,44 +4448,12 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
 
 
                                     }
-
-
-                                    }
                                     break;
 
                             }
 
 
                             }
-                            break;
-                        case 2 :
-                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1956:6: (lv_newObject_8= ruleCreatedObject )
-                            {
-                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1956:6: (lv_newObject_8= ruleCreatedObject )
-                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1959:6: lv_newObject_8= ruleCreatedObject
-                            {
-                             
-                            	        currentNode=createCompositeNode(grammarAccess.prSingleAssignmentValue().ele010ParserRuleCallCreatedObject(), currentNode); 
-                            	    
-                            pushFollow(FOLLOW_ruleCreatedObject_in_ruleSingleAssignmentValue4119);
-                            lv_newObject_8=ruleCreatedObject();
-                            _fsp--;
-
-
-                            	        if (current==null) {
-                            	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-                            	            associateNodeWithAstElement(currentNode.getParent(), current);
-                            	        }
-                            	        
-                            	        try {
-                            	       		set(current, "newObject", lv_newObject_8, "CreatedObject", currentNode);
-                            	        } catch (ValueConverterException vce) {
-                            				handleValueConverterException(vce);
-                            	        }
-                            	        currentNode = currentNode.getParent();
-                            	    
-
-                            }
 
 
                             }
@@ -4446,55 +4465,36 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1978:6: ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) )
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1993:6: (lv_newObject_10= ruleCreatedObject )
                     {
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1978:6: ( ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT ) )
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1978:7: ( RULE_ID ) (lv_impFrag_10= RULE_FRAGMENT )
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1993:6: (lv_newObject_10= ruleCreatedObject )
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1996:6: lv_newObject_10= ruleCreatedObject
                     {
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1978:7: ( RULE_ID )
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1981:3: RULE_ID
-                    {
-
-                    			if (current==null) {
-                    	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-                    	            associateNodeWithAstElement(currentNode, current);
-                    	        }
-                            
-                    match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4153); 
-
-                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele100CrossReferenceEStringImport(), "import"); 
-                    	
-
-                    }
-
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1994:2: (lv_impFrag_10= RULE_FRAGMENT )
-                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g:1996:6: lv_impFrag_10= RULE_FRAGMENT
-                    {
-                    lv_impFrag_10=(Token)input.LT(1);
-                    match(input,RULE_FRAGMENT,FOLLOW_RULE_FRAGMENT_in_ruleSingleAssignmentValue4178); 
+                     
+                    	        currentNode=createCompositeNode(grammarAccess.prSingleAssignmentValue().ele10ParserRuleCallCreatedObject(), currentNode); 
+                    	    
+                    pushFollow(FOLLOW_ruleCreatedObject_in_ruleSingleAssignmentValue4183);
+                    lv_newObject_10=ruleCreatedObject();
+                    _fsp--;
 
-                    		createLeafNode(grammarAccess.prSingleAssignmentValue().ele110LexerRuleCallFRAGMENT(), "impFrag"); 
-                    	
 
                     	        if (current==null) {
                     	            current = factory.create(grammarAccess.prSingleAssignmentValue().getRule().getType().getType());
-                    	            associateNodeWithAstElement(currentNode, current);
+                    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
                     	        try {
-                    	       		set(current, "impFrag", lv_impFrag_10, "FRAGMENT", lastConsumedNode);
+                    	       		set(current, "newObject", lv_newObject_10, "CreatedObject", currentNode);
                     	        } catch (ValueConverterException vce) {
                     				handleValueConverterException(vce);
                     	        }
+                    	        currentNode = currentNode.getParent();
                     	    
 
                     }
 
 
                     }
-
-
-                    }
                     break;
 
             }
@@ -5835,15 +5835,15 @@ public class InternalEpatchTestLanguageParser extends AbstractInternalAntlrParse
     public static final BitSet FOLLOW_EOF_in_entryRuleSingleAssignmentValue3849 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_33_in_ruleSingleAssignmentValue3898 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_RULE_STRING_in_ruleSingleAssignmentValue3939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue3977 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_19_in_ruleSingleAssignmentValue3991 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4013 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_29_in_ruleSingleAssignmentValue4033 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleSingleAssignmentValue4055 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleSingleAssignmentValue4073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCreatedObject_in_ruleSingleAssignmentValue4119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4153 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_FRAGMENT_in_ruleSingleAssignmentValue4178 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue3977 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_FRAGMENT_in_ruleSingleAssignmentValue4002 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4041 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_19_in_ruleSingleAssignmentValue4055 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleSingleAssignmentValue4077 = new BitSet(new long[]{0x0000000020000002L});
+    public static final BitSet FOLLOW_29_in_ruleSingleAssignmentValue4097 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleSingleAssignmentValue4119 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_ruleSingleAssignmentValue4137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCreatedObject_in_ruleSingleAssignmentValue4183 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleCreatedObject_in_entryRuleCreatedObject4222 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleCreatedObject4232 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleObjectNew_in_ruleCreatedObject4281 = new BitSet(new long[]{0x0000000000002012L});
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
index 538564b..1c07e5d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
@@ -396,15 +396,15 @@ public class EpatchTestLanguageParserConfiguration extends AbstractParserConfigu
 		getListAssignmentValueConsumer().setRuleCall$31$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
 		getListAssignmentValueConsumer().setRuleCall$40$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
 		getSingleAssignmentValueConsumer().setCrossReference$11$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
-		getSingleAssignmentValueConsumer().setCrossReference$28$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
+		getSingleAssignmentValueConsumer().setCrossReference$17$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
 		getSingleAssignmentValueConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$9$Delimiter);
-		getSingleAssignmentValueConsumer().setKeyword$15$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
-		getSingleAssignmentValueConsumer().setKeyword$20$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
-		getSingleAssignmentValueConsumer().setKeyword$23$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
+		getSingleAssignmentValueConsumer().setKeyword$21$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
+		getSingleAssignmentValueConsumer().setKeyword$26$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
+		getSingleAssignmentValueConsumer().setKeyword$29$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
 		getSingleAssignmentValueConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
-		getSingleAssignmentValueConsumer().setRuleCall$17$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
-		getSingleAssignmentValueConsumer().setRuleCall$22$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
-		getSingleAssignmentValueConsumer().setRuleCall$31$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
+		getSingleAssignmentValueConsumer().setRuleCall$14$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
+		getSingleAssignmentValueConsumer().setRuleCall$23$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
+		getSingleAssignmentValueConsumer().setRuleCall$28$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
 		getCreatedObjectConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
 		getCreatedObjectConsumer().setKeyword$19$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.keyword$12$Delimiter);
 		getCreatedObjectConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$11$Delimiter);
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java
index 0268c4f..8b005a1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java
@@ -44,7 +44,15 @@ public final class EpatchTestLanguageAssignmentConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -73,18 +81,50 @@ public final class EpatchTestLanguageAssignmentConsumer extends NonTerminalConsu
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$4(int entryPoint) throws Exception {
 		return consumeNonTerminal(biSingleAssignmentConsumer, null, false, false, false, getRule().ele000ParserRuleCallBiSingleAssignment());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeNonTerminal(biListAssignmentConsumer, null, false, false, false, getRule().ele001ParserRuleCallBiListAssignment());
 	}
 
 	protected int consumeRuleCall$6(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$6(int entryPoint) throws Exception {
 		return consumeNonTerminal(monoSingleAssignmentConsumer, null, false, false, false, getRule().ele01ParserRuleCallMonoSingleAssignment());
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$7(int entryPoint) throws Exception {
 		return consumeNonTerminal(monoListAssignmentConsumer, null, false, false, false, getRule().ele1ParserRuleCallMonoListAssignment());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java
index 07c1d0e..9055861 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java
@@ -73,7 +73,15 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeAlternatives$1(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
+		int result = doConsumeAlternatives$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$1(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().eleAlternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -102,7 +110,16 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeAssignment$4(int entryPoint) throws Exception {
-		return consumeRuleCall$5(entryPoint);
+		int result = doConsumeAssignment$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$4(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000AssignmentValue());
+		return result.getResult(consumeRuleCall$5(entryPoint));
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
@@ -110,7 +127,15 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeGroup$6(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		int result = doConsumeGroup$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$6(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -133,7 +158,16 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeAssignment$7(int entryPoint) throws Exception {
-		return consumeCrossReference$8(entryPoint);
+		int result = doConsumeAssignment$7(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$7(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$7(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0010AssignmentRefObject());
+		return result.getResult(consumeCrossReference$8(entryPoint));
 	}
 
 	protected int consumeCrossReference$8(int entryPoint) throws Exception {
@@ -152,7 +186,7 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int doConsumeGroup$10(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0011Group());
+		final GroupResult result = createGroupResult(getRule().ele0011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -182,11 +216,28 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$12(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$12(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001100KeywordFullStop(), null, false, false, getKeyword$12$Delimiter());
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele001101AssignmentRefFeature());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -205,7 +256,7 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int doConsumeGroup$15(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00111Group());
+		final GroupResult result = createGroupResult(getRule().ele00111Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -235,11 +286,28 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$17(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$17(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0011100KeywordLeftSquareBracket(), null, false, false, getKeyword$17$Delimiter());
 	}
 
 	protected int consumeAssignment$18(int entryPoint) throws Exception {
-		return consumeRuleCall$19(entryPoint);
+		int result = doConsumeAssignment$18(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$18(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$18(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0011101AssignmentRefIndex());
+		return result.getResult(consumeRuleCall$19(entryPoint));
 	}
 
 	protected int consumeRuleCall$19(int entryPoint) throws Exception {
@@ -247,11 +315,28 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeKeyword$20(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$20(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$20(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$20(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001111KeywordRightSquareBracket(), null, false, false, getKeyword$20$Delimiter());
 	}
 
 	protected int consumeAssignment$21(int entryPoint) throws Exception {
-		return consumeRuleCall$22(entryPoint);
+		int result = doConsumeAssignment$21(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$21(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$21(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentNewObject());
+		return result.getResult(consumeRuleCall$22(entryPoint));
 	}
 
 	protected int consumeRuleCall$22(int entryPoint) throws Exception {
@@ -259,7 +344,15 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeGroup$23(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele1Group());
+		int result = doConsumeGroup$23(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$23(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$23(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().ele1Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -282,7 +375,16 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeAssignment$24(int entryPoint) throws Exception {
-		return consumeCrossReference$25(entryPoint);
+		int result = doConsumeAssignment$24(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$24(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$24(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele10AssignmentImport());
+		return result.getResult(consumeCrossReference$25(entryPoint));
 	}
 
 	protected int consumeCrossReference$25(int entryPoint) throws Exception {
@@ -290,7 +392,16 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal
 	}
 
 	protected int consumeAssignment$27(int entryPoint) throws Exception {
-		return consumeRuleCall$28(entryPoint);
+		int result = doConsumeAssignment$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$27(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele11AssignmentImpFrag());
+		return result.getResult(consumeRuleCall$28(entryPoint));
 	}
 
 	protected int consumeRuleCall$28(int entryPoint) throws Exception {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java
index 693856e..efed3e9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java
@@ -64,7 +64,15 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -129,7 +137,16 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeAssignment$8(int entryPoint) throws Exception {
-		return consumeRuleCall$9(entryPoint);
+		int result = doConsumeAssignment$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$8(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000000AssignmentFeature());
+		return result.getResult(consumeRuleCall$9(entryPoint));
 	}
 
 	protected int consumeRuleCall$9(int entryPoint) throws Exception {
@@ -137,10 +154,26 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeKeyword$10(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$10(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$10(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$10(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000001KeywordEqualsSign(), null, false, false, getKeyword$10$Delimiter());
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele000001KeywordLeftSquareBracket(), null, false, false, getKeyword$11$Delimiter());
 	}
 
@@ -156,7 +189,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int doConsumeGroup$12(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele00001Group());
+		final GroupResult result = createGroupResult(getRule().ele00001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -179,7 +212,16 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeAssignment$13(int entryPoint) throws Exception {
-		return consumeRuleCall$14(entryPoint);
+		int result = doConsumeAssignment$13(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$13(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$13(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele000010AssignmentLeftValues());
+		return result.getResult(consumeRuleCall$14(entryPoint));
 	}
 
 	protected int consumeRuleCall$14(int entryPoint) throws Exception {
@@ -197,7 +239,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int doConsumeGroup$15(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele000011Group());
+		final GroupResult result = createGroupResult(getRule().ele000011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -220,11 +262,28 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeKeyword$16(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$16(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$16(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$16(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0000110KeywordComma(), null, false, false, getKeyword$16$Delimiter());
 	}
 
 	protected int consumeAssignment$17(int entryPoint) throws Exception {
-		return consumeRuleCall$18(entryPoint);
+		int result = doConsumeAssignment$17(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$17(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$17(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0000111AssignmentLeftValues());
+		return result.getResult(consumeRuleCall$18(entryPoint));
 	}
 
 	protected int consumeRuleCall$18(int entryPoint) throws Exception {
@@ -232,6 +291,14 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeKeyword$19(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$19(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$19(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$19(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele0001KeywordVerticalLine(), null, false, false, getKeyword$19$Delimiter());
 	}
 
@@ -247,7 +314,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int doConsumeGroup$20(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele001Group());
+		final GroupResult result = createGroupResult(getRule().ele001Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -270,7 +337,16 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeAssignment$21(int entryPoint) throws Exception {
-		return consumeRuleCall$22(entryPoint);
+		int result = doConsumeAssignment$21(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$21(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$21(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0010AssignmentRightValues());
+		return result.getResult(consumeRuleCall$22(entryPoint));
 	}
 
 	protected int consumeRuleCall$22(int entryPoint) throws Exception {
@@ -288,7 +364,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int doConsumeGroup$23(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().ele0011Group());
+		final GroupResult result = createGroupResult(getRule().ele0011Group());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -311,11 +387,28 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeKeyword$24(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$24(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$24(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$24(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00110KeywordComma(), null, false, false, getKeyword$24$Delimiter());
 	}
 
 	protected int consumeAssignment$25(int entryPoint) throws Exception {
-		return consumeRuleCall$26(entryPoint);
+		int result = doConsumeAssignment$25(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$25(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$25(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00111AssignmentRightValues());
+		return result.getResult(consumeRuleCall$26(entryPoint));
 	}
 
 	protected int consumeRuleCall$26(int entryPoint) throws Exception {
@@ -323,10 +416,26 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina
 	}
 
 	protected int consumeKeyword$27(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$27(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$27(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$27(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele01KeywordRightSquareBracket(), null, false, false, getKeyword$27$Delimiter());
 	}
 
 	protected int consumeKeyword$28(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$28(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$28(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$28(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$28$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java
index c139491..1450bbf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java
@@ -52,7 +52,15 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -103,7 +111,16 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi
 	}
 
 	protected int consumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		int result = doConsumeAssignment$6(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$6(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele00000AssignmentFeature());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -111,11 +128,28 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi
 	}
 
 	protected int consumeKeyword$8(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$8(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$8(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$8(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele00001KeywordEqualsSign(), null, false, false, getKeyword$8$Delimiter());
 	}
 
 	protected int consumeAssignment$9(int entryPoint) throws Exception {
-		return consumeRuleCall$10(entryPoint);
+		int result = doConsumeAssignment$9(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$9(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$9(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele0001AssignmentLeftValue());
+		return result.getResult(consumeRuleCall$10(entryPoint));
 	}
 
 	protected int consumeRuleCall$10(int entryPoint) throws Exception {
@@ -123,11 +157,28 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi
 	}
 
 	protected int consumeKeyword$11(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$11(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$11(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$11(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele001KeywordVerticalLine(), null, false, false, getKeyword$11$Delimiter());
 	}
 
 	protected int consumeAssignment$12(int entryPoint) throws Exception {
-		return consumeRuleCall$13(entryPoint);
+		int result = doConsumeAssignment$12(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAssignment$12(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAssignment$12(int entryPoint) throws Exception {
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentRightValue());
+		return result.getResult(consumeRuleCall$13(entryPoint));
 	}
 
 	protected int consumeRuleCall$13(int entryPoint) throws Exception {
@@ -135,6 +186,14 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi
 	}
 
 	protected int consumeKeyword$14(int entryPoint) throws Exception {
+		int result = doConsumeKeyword$14(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeKeyword$14(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeKeyword$14(int entryPoint) throws Exception {
 		return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$14$Delimiter());
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java
index 9ac123b..f91af26 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java
@@ -57,7 +57,15 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo
 	}
 
 	protected int consumeGroup$1(int entryPoint) throws Exception {
-		GroupResult result = createGroupResult(getRule().eleGroup());
+		int result = doConsumeGroup$1(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeGroup$1(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeGroup$1(int entryPoint) throws Exception {
+		final GroupResult result = createGroupResult(getRule().eleGroup());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -87,7 +95,15 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo
 	}
 
 	protected int consumeAlternatives$3(int entryPoint) throws Exception {
-		AlternativesResult result = createAlternativesResult(getRule().ele00Alternatives());
+		int result = doConsumeAlternatives$3(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeAlternatives$3(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeAlternatives$3(int entryPoint) throws Exception {
+		final AlternativesResult result = createAlternativesResult(getRule().ele00Alternatives());
 		switch(entryPoint) {
 			case -1: // use fall through semantics of switch case
 				result.reset();
@@ -106,10 +122,26 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo
 	}
 
 	protected int consumeRuleCall$4(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$4(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$4(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$4(int entryPoint) throws Exception {
 		return consumeNonTerminal(objectNewConsumer, null, false, false, false, getRule().ele000ParserRuleCallObjectNew());
 	}
 
 	protected int consumeRuleCall$5(int entryPoint) throws Exception {
+		int result = doConsumeRuleCall$5(nextEntryPoint());
+		while(result != ConsumeResult.SUCCESS && skipPreviousToken()) {
+			result = doConsumeRuleCall$5(nextEntryPoint());
+		}
+		return result;
+	}
+
+	protected int doConsumeRuleCall$5(int entryPoint) throws Exception {
 		return consumeNonTerminal(objectCopyConsumer, null, false, false, false, getRule().ele001ParserRuleCallObjectCopy());
 	}
 
@@ -125,7 +157,8 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo
 	}
 
 	protected int doConsumeAssignment$6(int entryPoint) throws Exception {
-		return consumeRuleCall$7(entryPoint);
+		final AssignmentResult result = createAssignmentResult(getRule().ele01AssignmentName());
+		return result.getResult(consumeRuleCall$7(entryPoint));
 	}
 
 	protected int consumeRuleCall$7(int entryPoint) throws Exception {
@@ -144,7 +177,7 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo
 	}
 
 	protected int doConsumeGroup$8(int entryPoint) throws Exception {
-		GroupResult result = createGroupResul