Further tests and minor fixes

25 files changed, 44 insertions, 33 deletions

diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
index 6d74b1d..9f2974c 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
@@ -34,10 +34,10 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="//TypedElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="TypedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TypeRef">
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenced" eType="//Type"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 30c6432..8d076d0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -20,12 +20,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
+      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
index de48997..9a7db29 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
@@ -96,7 +96,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Alternatives", "groups", true);
+		consumeAction(getRule().ele100ActionAlternativesgroups(), "Alternatives", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
index 51bdd57..7b65a24 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
@@ -97,7 +97,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("CharacterRange", "left", false);
+		consumeAction(getRule().ele100ActionCharacterRangeleft(), "CharacterRange", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
index e23b172..7b6d190 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
@@ -87,7 +87,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Group", "abstractTokens", true);
+		consumeAction(getRule().ele10ActionGroupabstractTokens(), "Group", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
index d1fdc06..cb24d60 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
@@ -96,7 +96,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Alternatives", "groups", true);
+		consumeAction(getRule().ele100ActionAlternativesgroups(), "Alternatives", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
index 814bf56..d73509a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
@@ -87,7 +87,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Group", "abstractTokens", true);
+		consumeAction(getRule().ele10ActionGroupabstractTokens(), "Group", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
index 64ced3d..f03a642 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
@@ -14,10 +14,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" unique="false" upperBound="-1" eType="//AbstractRule" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
index b388f74..ec3c83c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
@@ -96,7 +96,7 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Alternatives", "groups", true);
+		consumeAction(getRule().ele100ActionAlternativesgroups(), "Alternatives", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
index caf9726..aaf977c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
@@ -97,7 +97,7 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("CharacterRange", "left", false);
+		consumeAction(getRule().ele100ActionCharacterRangeleft(), "CharacterRange", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java
index c79e9ae..e38df4e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java
@@ -87,7 +87,7 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Group", "abstractTokens", true);
+		consumeAction(getRule().ele10ActionGroupabstractTokens(), "Group", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java
index 835d7e2..c311c4a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java
@@ -96,7 +96,7 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Alternatives", "groups", true);
+		consumeAction(getRule().ele100ActionAlternativesgroups(), "Alternatives", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java
index 8c0c6af..2e24c78 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java
@@ -87,7 +87,7 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Group", "abstractTokens", true);
+		consumeAction(getRule().ele10ActionGroupabstractTokens(), "Group", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java
index 81aaf03..fbe9974 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java
@@ -136,7 +136,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons
 		return result;
 	}
 	protected int consumeAction$6() {
-		consumeAction("Add", "addOperands", true);
+		consumeAction(getRule().ele1000ActionAddaddOperands(), "Add", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
@@ -179,7 +179,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons
 		return result;
 	}
 	protected int consumeAction$13() {
-		consumeAction("Minus", "minusOperands", true);
+		consumeAction(getRule().ele1100ActionMinusminusOperands(), "Minus", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java
index 7683f5b..9029fd9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java
@@ -185,7 +185,7 @@ public final class ComplexReconstrTestLanguageTrickyAConsumer extends NonTermina
 		return result;
 	}
 	protected int consumeAction$11() {
-		consumeAction("TypeB", "x", false);
+		consumeAction(getRule().ele0100ActionTypeBx(), "TypeB", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
@@ -212,7 +212,7 @@ public final class ComplexReconstrTestLanguageTrickyAConsumer extends NonTermina
 		return result;
 	}
 	protected int consumeAction$15() {
-		consumeAction("TypeC", "x", false);
+		consumeAction(getRule().ele0110ActionTypeCx(), "TypeC", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java
index 8b3a32f..395c8f2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java
@@ -131,7 +131,7 @@ public final class ComplexReconstrTestLanguageTrickyCConsumer extends NonTermina
 		return result;
 	}
 	protected int consumeAction$9() {
-		consumeAction("C1", "x", false);
+		consumeAction(getRule().ele0010ActionC1x(), "C1", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
@@ -168,7 +168,7 @@ public final class ComplexReconstrTestLanguageTrickyCConsumer extends NonTermina
 		return result;
 	}
 	protected int consumeAction$13() {
-		consumeAction("C2", "y", false);
+		consumeAction(getRule().ele010ActionC2y(), "C2", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
@@ -205,7 +205,7 @@ public final class ComplexReconstrTestLanguageTrickyCConsumer extends NonTermina
 		return result;
 	}
 	protected int consumeAction$17() {
-		consumeAction("C3", "z", false);
+		consumeAction(getRule().ele10ActionC3z(), "C3", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java
index a2c355c..dc29331 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java
@@ -87,7 +87,7 @@ public final class SimpleReconstrTestLanguageOpConsumer extends NonTerminalConsu
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Op", "values", true);
+		consumeAction(getRule().ele10ActionOpvalues(), "Op", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java
index e10dabd..cd82af1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java
@@ -65,7 +65,7 @@ public final class ActionTestLanguageElementConsumer extends NonTerminalConsumer
 		return consumeNonTerminal(itemConsumer, null, false, false, getRule().ele0ParserRuleCallItem());
 	}
 	protected int consumeAction$4() {
-		consumeAction("Item", "items", true);
+		consumeAction(getRule().ele10ActionItemitems(), "Item", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java
index e9e8403..2a849f3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java
@@ -58,7 +58,7 @@ public final class ActionTestLanguageItemConsumer extends NonTerminalConsumer {
 		return result;
 	}
 	protected int consumeAction$2() {
-		consumeAction("Thing", "content", false);
+		consumeAction(getRule().ele0ActionThingcontent(), "Thing", false);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java
index b4ec891..cf41e5d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java
@@ -99,7 +99,7 @@ public final class SimpleExpressionsTestLanguageAdditionConsumer extends NonTerm
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Op", "values", true);
+		consumeAction(getRule().ele100ActionOpvalues(), "Op", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java
index d280227..0ca5d60 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java
@@ -99,7 +99,7 @@ public final class SimpleExpressionsTestLanguageMultiplicationConsumer extends N
 		return result;
 	}
 	protected int consumeAction$5() {
-		consumeAction("Op", "values", true);
+		consumeAction(getRule().ele100ActionOpvalues(), "Op", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java
index 4b7c7da..3e4d7b6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java
@@ -87,7 +87,7 @@ public final class SimpleExpressionsTestLanguageSequenceConsumer extends NonTerm
 		return result;
 	}
 	protected int consumeAction$4() {
-		consumeAction("Sequence", "expressions", true);
+		consumeAction(getRule().ele10ActionSequenceexpressions(), "Sequence", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java
index 15d205a..d6ee544 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java
@@ -101,7 +101,7 @@ public final class TestLanguageReducibleRuleConsumer extends NonTerminalConsumer
 		return result;
 	}
 	protected int consumeAction$6() {
-		consumeAction("ReducibleComposite", "actionFeature", true);
+		consumeAction(getRule().ele10ActionReducibleCompositeactionFeature(), "ReducibleComposite", true);
 		return ConsumeResult.SUCCESS;	
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractPackratAntlrComparingTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractPackratAntlrComparingTest.java
index 4d07631..c9a4716 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractPackratAntlrComparingTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractPackratAntlrComparingTest.java
@@ -14,7 +14,7 @@ public abstract class AbstractPackratAntlrComparingTest extends AbstractParserCo
 
 	@Override
 	protected IParser createFirstParser() {
-		return getParser();
+		return ((SwitchingParser)getParser()).getAntlrParser();
 	}
 
 	@Override
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java
index 3689c9f..c13ad1a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java
@@ -7,12 +7,13 @@
  *******************************************************************************/
 package org.eclipse.xtext.parser;
 
-import org.eclipse.xtext.GenerateAllTestGrammars;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.tests.AbstractGeneratorTest;
+import org.eclipse.xtext.util.EmfFormater;
 import org.eclipse.xtext.util.EmfStructureComparator;
 import org.eclipse.xtext.util.Pair;
 import org.eclipse.xtext.util.StringInputStream;
+import org.eclipse.xtext.util.Wrapper;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
@@ -41,15 +42,25 @@ public abstract class AbstractParserComparingTest extends AbstractGeneratorTest
 	protected abstract Iterable<Pair<String, String>> getAllModels();
 	
 	public void testCompareAllModels() throws Exception {
-		EmfStructureComparator comparator = new EmfStructureComparator();
+		final Wrapper<String> modelName = Wrapper.forType(String.class); 
+		EmfStructureComparator comparator = new EmfStructureComparator() {
+			@Override
+			protected String getErrorMessage() {
+				return modelName.get() + " - " + super.getErrorMessage();
+			}
+		};
 		for(Pair<String, String> pair: getAllModels()) {
 			String model = pair.getSecond();
+			modelName.set(pair.getFirst() + "(" + getFirstParserName() + " / " + getSecondParserName() + ")");
 			XtextResource firstResult = firstHelper.getResourceFromStream(new StringInputStream(model));
 			XtextResource secondResult = secondHelper.getResourceFromStream(new StringInputStream(model));
 			checkResource(pair.getFirst() + " - " + getFirstParserName(), firstResult);
 			checkResource(pair.getFirst() + " - " + getSecondParserName(), secondResult);
 			comparator.assertSameStructure(firstResult.getParseResult().getRootASTElement(), secondResult.getParseResult().getRootASTElement());
-//			comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode());
+			comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode());
+//			String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), "    ");
+//			String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), "    ");
+//			assertEquals(firstResultAsString, secondResultAsString);
 		}
 	}