build fixed

37 files changed, 76 insertions, 75 deletions

diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
index 1f2d8ff..8af5eb3 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
index e234417..c70d0ae 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
@@ -16,12 +16,12 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eStructuralFeatures>
     <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:EAttribute" name="age">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
index 791cf18..c9c3fdd 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
index 60ac229..edaaaf7 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
index fc69f3a..8d23340 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
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 8d076d0..30c6432 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: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>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </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/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
index 4532fd3..5825984 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
index 2a34366..debb9d2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
index b410695..45cf438 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeConfig.java
index eb0696c..97d0fcf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeConfig.java
@@ -25,7 +25,7 @@ public abstract class AbstractAbstractTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -36,7 +36,7 @@ public abstract class AbstractAbstractTestLanguageRuntimeConfig extends Abstract
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
index b2887a2..499d959 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
index d0c7eeb..0ddc341 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
index d0d18d5..d389013 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
index 626f97b..a16043b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
index 3b679de..941ca97 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
index 6c9d5d3..548f147 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
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 54d3239..64ced3d 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
@@ -20,12 +20,12 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
-    <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>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </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/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
index f2b8a06..b7087f8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
index 974951d..59eefa0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
index aa6ef81..85a87b2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
index 47cf9bb..38c69ff 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
index 5803f91..9821853 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
index d1a6772..5089fb0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
index 44c9e9d..1d5021b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
index 27e49ca..5003362 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
index 1db2ffd..43a68e7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
index dd74ba0..716847b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
index 1c64b06..429b36c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
index f3a3f3d..bfa635e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
index 27f7d3d..e5e5f9c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
index 0d43dca..48cc7c4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
index 096555e..37b70bf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
index 6f1c85e..2a3e8d7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
index 1ae4ac3..a14e683 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}
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 2fdcfcb..3689c9f 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
@@ -49,7 +49,7 @@ public abstract class AbstractParserComparingTest extends AbstractGeneratorTest
 			checkResource(pair.getFirst() + " - " + getFirstParserName(), firstResult);
 			checkResource(pair.getFirst() + " - " + getSecondParserName(), secondResult);
 			comparator.assertSameStructure(firstResult.getParseResult().getRootASTElement(), secondResult.getParseResult().getRootASTElement());
-//			comparator.assertSameStructure(firstResult.getParseResult().getRootElement(), firstResult.getParseResult().getRootASTElement());
+//			comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode());
 		}
 	}
 	
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java
index 4a01227..652d891 100755
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java
@@ -31,6 +31,7 @@ import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.parser.DefaultEcoreElementFactory;
 import org.eclipse.xtext.parser.IAstFactory;
 import org.eclipse.xtext.parser.IParser;
+import org.eclipse.xtext.parser.ISwitchingParser;
 import org.eclipse.xtext.parser.packrat.AbstractPackratParser;
 import org.eclipse.xtext.parser.packrat.ParseResultFactory;
 import org.eclipse.xtext.parsetree.CompositeNode;
@@ -99,7 +100,7 @@ public abstract class AbstractGeneratorTest extends TestCase {
 	}
 
 	protected IParser getParser() {
-		return ServiceRegistry.getService(currentScope, IParser.class);
+		return ServiceRegistry.getService(currentScope, ISwitchingParser.class);
 	}
 
 	protected IAstFactory getASTFactory() {
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
index f9459c4..75081dd 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
@@ -61,7 +61,7 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parser.packrat.ParseResultFactory.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+	protected Class<? extends org.eclipse.xtext.parser.ISwitchingParser> getISwitchingParser() {
 		return org.eclipse.xtext.parser.SwitchingParser.class;
 	}
 		
@@ -81,7 +81,7 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
 		.with(org.eclipse.xtext.parser.packrat.IParseResultFactory.class, getIParseResultFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.ISwitchingParser.class, getISwitchingParser())
 		
 			.registrations();
 	}