Extracted token-to-string conversion

36 files changed, 323 insertions, 163 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 8af5eb3..1a938db 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
@@ -17,6 +17,10 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.reference.services.ReferenceGrammarResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return scope(org.eclipse.xtext.reference.IReferenceGrammar.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 c9c3fdd..5b287fb 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
@@ -17,6 +17,10 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return org.eclipse.xtext.example.services.DomainmodelGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.example.services.DomainmodelResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return scope(org.eclipse.xtext.example.IDomainmodel.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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/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 edaaaf7..f2e5bf9 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
@@ -17,6 +17,10 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.example.services.FowlerDslGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.example.services.FowlerDslResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.example.parser.antlr.FowlerDslParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.example.parser.antlr.FowlerDslAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return scope(org.eclipse.xtext.example.IFowlerDsl.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 8d23340..645c913 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
@@ -17,6 +17,10 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.services.XtextGrammarTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return scope(org.eclipse.xtext.IXtextGrammarTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 6edbed4..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
@@ -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/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
index 5825984..427f7bd 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
@@ -17,6 +17,10 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return scope(org.eclipse.xtext.crossrefs.IImportUriTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 debb9d2..8fa72a1 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
@@ -17,6 +17,10 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.crossrefs.services.LangATestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.crossrefs.services.LangATestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return scope(org.eclipse.xtext.crossrefs.ILangATestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 45cf438..9b58d97 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
@@ -17,6 +17,10 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.dummy.services.DummyTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.dummy.services.DummyTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return scope(org.eclipse.xtext.dummy.IDummyTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 499d959..5aaec09 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
@@ -17,6 +17,10 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.grammarinheritance.services.ConcreteTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.grammarinheritance.services.ConcreteTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return scope(org.eclipse.xtext.grammarinheritance.IConcreteTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 0ddc341..601af90 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
@@ -17,6 +17,10 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return scope(org.eclipse.xtext.metamodelreferencing.tests.IMetamodelRefTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 d389013..8806b4a 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
@@ -17,6 +17,10 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return scope(org.eclipse.xtext.metamodelreferencing.tests.IMultiGenMMTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 a16043b..0c82ca1 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
@@ -17,6 +17,10 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return scope(org.eclipse.xtext.parser.datatyperules.IDatatypeRulesTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 941ca97..9e474b4 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
@@ -17,6 +17,10 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return scope(org.eclipse.xtext.parser.terminalrules.ITerminalRulesTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 548f147..aeb141b 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
@@ -17,6 +17,10 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return scope(org.eclipse.xtext.parser.terminalrules.IXtextTerminalsTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 f03a642..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
@@ -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/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
index b7087f8..61bb638 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
@@ -17,6 +17,10 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return scope(org.eclipse.xtext.parsetree.formatter.IFormatterTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 59eefa0..05bc7eb 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
@@ -17,6 +17,10 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return org.eclipse.xtext.parsetree.reconstr.services.ComplexReconstrTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.reconstr.services.ComplexReconstrTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return scope(org.eclipse.xtext.parsetree.reconstr.IComplexReconstrTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 85a87b2..7845da4 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
@@ -17,6 +17,10 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.services.SimpleReconstrTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.reconstr.services.SimpleReconstrTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return scope(org.eclipse.xtext.parsetree.reconstr.ISimpleReconstrTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 38c69ff..cc00a56 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
@@ -17,6 +17,10 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return org.eclipse.xtext.parsetree.transientvalues.services.TransientValuesTestGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.transientvalues.services.TransientValuesTestResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return scope(org.eclipse.xtext.parsetree.transientvalues.ITransientValuesTest.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 9821853..cc0abe7 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
@@ -17,6 +17,10 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.resource.metamodel.services.MultiValueFeatureTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.resource.metamodel.services.MultiValueFeatureTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return scope(org.eclipse.xtext.resource.metamodel.IMultiValueFeatureTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 5089fb0..7988e3a 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
@@ -17,6 +17,10 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return org.eclipse.xtext.testlanguages.services.ActionTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ActionTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return scope(org.eclipse.xtext.testlanguages.IActionTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 1d5021b..ab198de 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
@@ -17,6 +17,10 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.services.ContentAssistTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ContentAssistTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return scope(org.eclipse.xtext.testlanguages.IContentAssistTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 5003362..91fa82a 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
@@ -17,6 +17,10 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.testlanguages.services.FowlerDslTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.FowlerDslTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return scope(org.eclipse.xtext.testlanguages.IFowlerDslTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 43a68e7..9c19f91 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
@@ -17,6 +17,10 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.testlanguages.services.LexerTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.LexerTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return scope(org.eclipse.xtext.testlanguages.ILexerTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 716847b..bf0bbd9 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
@@ -17,6 +17,10 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.testlanguages.services.LookaheadTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.LookaheadTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return scope(org.eclipse.xtext.testlanguages.ILookaheadTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 429b36c..a9fcc99 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
@@ -17,6 +17,10 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.services.OptionalEmptyTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.OptionalEmptyTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return scope(org.eclipse.xtext.testlanguages.IOptionalEmptyTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 bfa635e..bd94095 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
@@ -17,6 +17,10 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.services.PartialParserTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.PartialParserTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return scope(org.eclipse.xtext.testlanguages.IPartialParserTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 e5e5f9c..e6423b4 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
@@ -17,6 +17,10 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.testlanguages.services.ReferenceGrammarTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ReferenceGrammarTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return scope(org.eclipse.xtext.testlanguages.IReferenceGrammarTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 48cc7c4..192fd86 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
@@ -17,6 +17,10 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.testlanguages.services.SimpleExpressionsTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.SimpleExpressionsTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return scope(org.eclipse.xtext.testlanguages.ISimpleExpressionsTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 37b70bf..12f35ab 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
@@ -17,6 +17,10 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.testlanguages.services.TestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.TestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return scope(org.eclipse.xtext.testlanguages.ITestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 2a3e8d7..072465c 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
@@ -17,6 +17,10 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.testlanguages.services.TreeTestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.TreeTestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return scope(org.eclipse.xtext.testlanguages.ITreeTestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index d0d0a55..8d02c8e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="familie" unique="false" upperBound="-1" eType="//Familie" containment="true"/>
   </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/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 a14e683..66d7572 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
@@ -17,6 +17,10 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.valueconverter.services.Bug250313GrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.valueconverter.services.Bug250313ResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313Parser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313AntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return scope(org.eclipse.xtext.valueconverter.IBug250313.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
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 2e29648..9e4efe0 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
@@ -60,8 +60,13 @@ public abstract class AbstractParserComparingTest extends AbstractGeneratorTest
 			checkResource(pair.getFirst() + " - " + getSecondParserName(), secondResult);
 			comparator.assertSameStructure(firstResult.getParseResult().getRootASTElement(), secondResult.getParseResult().getRootASTElement());
 			comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode());
-			String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), getIgnoredFeatures());
-			String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), getIgnoredFeatures());
+			
+			String firstNodeResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), getIgnoredFeatures());
+			String secondNodeResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), getIgnoredFeatures());
+			assertEquals(firstNodeResultAsString, secondNodeResultAsString);
+			
+			String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootASTElement());
+			String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootASTElement());
 			assertEquals(firstResultAsString, secondResultAsString);
 		}
 	}
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 75081dd..0f3098b 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
@@ -17,6 +17,10 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.ui.integration.services.TestLanguageGrammarAccess.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.DefaultEcoreElementFactory.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.ui.integration.services.TestLanguageResourceFactory.class;
 	}
@@ -37,14 +41,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> getIAntlrParser() {
 		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageParser.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> getITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
 	}
@@ -70,13 +74,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return scope(org.eclipse.xtext.ui.integration.ITestLanguage.SCOPE)
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrParser.class, getIAntlrParser())
+		.with(org.eclipse.xtext.parser.ITokenToStringConverter.class, getITokenToStringConverter())
 		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())