summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-01-28 05:27:52 (EST)
committer sefftinge2009-01-28 05:27:52 (EST)
commite0b1b390510dbd3d976c9e47728ccd3f46aeb3cd (patch)
tree36522fcdcc10d72b7a605f9f0c9d0f3f2c59df72
parent7cdc349b9297421f41f10d6d187b3f210f170191 (diff)
downloadorg.eclipse.xtext-e0b1b390510dbd3d976c9e47728ccd3f46aeb3cd.zip
org.eclipse.xtext-e0b1b390510dbd3d976c9e47728ccd3f46aeb3cd.tar.gz
org.eclipse.xtext-e0b1b390510dbd3d976c9e47728ccd3f46aeb3cd.tar.bz2
Further tests and minor fixes - antlr parser and packrat parser produce the same node model
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java8
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java4
37 files changed, 66 insertions, 61 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index 2a04ccc..782328a 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -155,7 +155,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
protected int consumeAssignment$16() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000010CrossReferenceEStringErwachsener(), getCrossReference$17$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "mutter", false, false, getRule().ele000010CrossReferenceEStringErwachsener(), getCrossReference$17$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -165,7 +165,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
protected int consumeAssignment$19() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele00010CrossReferenceEStringErwachsener(), getCrossReference$20$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "vater", false, false, getRule().ele00010CrossReferenceEStringErwachsener(), getCrossReference$20$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -175,7 +175,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
protected int consumeAssignment$22() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele0010CrossReferenceEStringKind(), getCrossReference$23$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "kinder", true, false, getRule().ele0010CrossReferenceEStringKind(), getCrossReference$23$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -217,7 +217,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
protected int consumeAssignment$27() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele0110CrossReferenceEStringKind(), getCrossReference$28$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "kinder", true, false, getRule().ele0110CrossReferenceEStringKind(), getCrossReference$28$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
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 9f2974c..6d74b1d 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.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index 135d6bc..c76dfed 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -149,7 +149,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
protected int consumeAssignment$11() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000110CrossReferenceEStringEntity(), getCrossReference$12$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "superType", false, false, getRule().ele000110CrossReferenceEStringEntity(), getCrossReference$12$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index 308fd37..f018e52 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -154,7 +154,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
protected int consumeAssignment$13() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele110CrossReferenceEStringReference(), getCrossReference$14$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "opposite", false, false, getRule().ele110CrossReferenceEStringReference(), getCrossReference$14$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
index 76b5b6d..8db993b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
@@ -42,7 +42,7 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
protected int consumeAssignment$1() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringType(), getCrossReference$2$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "referenced", false, false, getRule().ele0CrossReferenceEStringType(), getCrossReference$2$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
index d6ef4c5..2314af9 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
@@ -179,7 +179,7 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
protected int doConsumeAssignment$13() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele001010CrossReferenceEStringCommand(), getCrossReference$14$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "actions", true, false, getRule().ele001010CrossReferenceEStringCommand(), getCrossReference$14$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
index 3aee525..6ee42e6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
@@ -73,7 +73,7 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
protected int consumeAssignment$3() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000CrossReferenceEStringEvent(), getCrossReference$4$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "event", false, false, getRule().ele000CrossReferenceEStringEvent(), getCrossReference$4$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -87,7 +87,7 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringState(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "state", false, false, getRule().ele10CrossReferenceEStringState(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 8d076d0..6edbed4 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,18 +14,18 @@
<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:EAttribute" name="alias">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
index c8fb2a8..97b4402 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
@@ -100,7 +100,7 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer
protected int consumeAssignment$8() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "extends", false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
index a42a295..4b08e97 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
@@ -100,7 +100,7 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer {
protected int consumeAssignment$8() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "extends", false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
index 10aab4c..411ea7b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java
@@ -42,7 +42,7 @@ public final class MetamodelRefTestLanguageNameRefConsumer extends NonTerminalCo
protected int consumeAssignment$1() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringParserRule(), getCrossReference$2$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0CrossReferenceEStringParserRule(), getCrossReference$2$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
index d1f2b66..876dc92 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
@@ -131,7 +131,7 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer
protected int consumeAssignment$9() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0110CrossReferenceEStringAbstractRule(), getCrossReference$10$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0110CrossReferenceEStringAbstractRule(), getCrossReference$10$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
index dee95b1..9c52465 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
@@ -101,7 +101,7 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(stringConsumer, null, false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(stringConsumer, "ePackage", false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
index 290f8fe..8272e4f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
@@ -236,7 +236,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina
protected int consumeAssignment$19() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele00010010CrossReferenceEStringAbstractRule(), getCrossReference$20$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "hiddenTokens", true, false, getRule().ele00010010CrossReferenceEStringAbstractRule(), getCrossReference$20$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -250,7 +250,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina
protected int consumeAssignment$24() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele00010110CrossReferenceEStringAbstractRule(), getCrossReference$25$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "hiddenTokens", true, false, getRule().ele00010110CrossReferenceEStringAbstractRule(), getCrossReference$25$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
index d916f6d..bd7e4e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
@@ -82,7 +82,7 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N
protected int consumeAssignment$4() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(stringConsumer, null, false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$5$Delimiter());
+ tempResult = consumeTerminal(stringConsumer, "ePackage", false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$5$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java
index 4ee0201..edd5d12 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java
@@ -42,7 +42,7 @@ public final class XtextGrammarTestLanguageRuleCallConsumer extends NonTerminalC
protected int consumeAssignment$1() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
index 5c33e92..244647e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
@@ -96,7 +96,7 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo
protected int consumeAssignment$3() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000CrossReferenceEStringAbstractMetamodelDeclaration(), getCrossReference$4$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "metamodel", false, false, getRule().ele000CrossReferenceEStringAbstractMetamodelDeclaration(), getCrossReference$4$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -110,7 +110,7 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringEClassifier(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "type", false, false, getRule().ele10CrossReferenceEStringEClassifier(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
index 0c25746..e208f30 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
@@ -131,7 +131,7 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT
protected int consumeAssignment$9() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0110CrossReferenceEStringAbstractRule(), getCrossReference$10$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0110CrossReferenceEStringAbstractRule(), getCrossReference$10$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
index 36a3acc..4c4014f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
@@ -101,7 +101,7 @@ public final class XtextTerminalsTestLanguageGeneratedMetamodelConsumer extends
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(stringConsumer, null, false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(stringConsumer, "ePackage", false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java
index b60648b..7351d20 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java
@@ -230,7 +230,7 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi
protected int consumeAssignment$19() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele00010010CrossReferenceEStringAbstractRule(), getCrossReference$20$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "hiddenTokens", true, false, getRule().ele00010010CrossReferenceEStringAbstractRule(), getCrossReference$20$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -272,7 +272,7 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi
protected int consumeAssignment$24() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele00010110CrossReferenceEStringAbstractRule(), getCrossReference$25$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "hiddenTokens", true, false, getRule().ele00010110CrossReferenceEStringAbstractRule(), getCrossReference$25$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java
index 0da72ca..727ce4e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java
@@ -82,7 +82,7 @@ public final class XtextTerminalsTestLanguageReferencedMetamodelConsumer extends
protected int consumeAssignment$4() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(stringConsumer, null, false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$5$Delimiter());
+ tempResult = consumeTerminal(stringConsumer, "ePackage", false, false, getRule().ele010CrossReferenceEStringEPackage(), getCrossReference$5$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java
index a9a80be..0af3e6e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java
@@ -42,7 +42,7 @@ public final class XtextTerminalsTestLanguageRuleCallConsumer extends NonTermina
protected int consumeAssignment$1() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java
index 7463b49..ac9f83e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java
@@ -96,7 +96,7 @@ public final class XtextTerminalsTestLanguageTypeRefConsumer extends NonTerminal
protected int consumeAssignment$3() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000CrossReferenceEStringAbstractMetamodelDeclaration(), getCrossReference$4$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "metamodel", false, false, getRule().ele000CrossReferenceEStringAbstractMetamodelDeclaration(), getCrossReference$4$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -110,7 +110,7 @@ public final class XtextTerminalsTestLanguageTypeRefConsumer extends NonTerminal
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringEClassifier(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "type", false, false, getRule().ele10CrossReferenceEStringEClassifier(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java
index 22bb7a3..7817f18 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java
@@ -100,7 +100,7 @@ public final class SimpleReconstrTestLanguageTypeConsumer extends NonTerminalCon
protected int consumeAssignment$8() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "extends", false, false, getRule().ele10CrossReferenceEStringType(), getCrossReference$9$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
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 8d02c8e..d0d0a55 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="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>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </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/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java
index 116a566..6276fd4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java
@@ -42,7 +42,7 @@ public final class ContentAssistTestLanguageAbstractRuleCallConsumer extends Non
protected int consumeAssignment$1() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "rule", false, false, getRule().ele0CrossReferenceEStringAbstractRule(), getCrossReference$2$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java
index 1d98de0..076a826 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java
@@ -179,7 +179,7 @@ public final class FowlerDslTestLanguageStateConsumer extends NonTerminalConsume
protected int doConsumeAssignment$13() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele001010CrossReferenceEStringCommand(), getCrossReference$14$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "actions", true, false, getRule().ele001010CrossReferenceEStringCommand(), getCrossReference$14$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java
index 0d28163..6f3328f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java
@@ -73,7 +73,7 @@ public final class FowlerDslTestLanguageTransitionConsumer extends NonTerminalCo
protected int consumeAssignment$3() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000CrossReferenceEStringEvent(), getCrossReference$4$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "event", false, false, getRule().ele000CrossReferenceEStringEvent(), getCrossReference$4$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -87,7 +87,7 @@ public final class FowlerDslTestLanguageTransitionConsumer extends NonTerminalCo
protected int consumeAssignment$7() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele10CrossReferenceEStringState(), getCrossReference$8$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "state", false, false, getRule().ele10CrossReferenceEStringState(), getCrossReference$8$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java
index 60a5040..a0549ce 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java
@@ -131,7 +131,7 @@ public final class PartialParserTestLanguageFirstConcreteConsumer extends NonTer
protected int doConsumeAssignment$11() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele010CrossReferenceEStringContainer(), getCrossReference$12$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "referencedContainer", false, false, getRule().ele010CrossReferenceEStringContainer(), getCrossReference$12$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java
index 533fe6c..011ea59 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java
@@ -144,7 +144,7 @@ public final class PartialParserTestLanguageSecondConcreteConsumer extends NonTe
protected int doConsumeAssignment$13() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele010CrossReferenceEStringChild(), getCrossReference$14$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "referencedChildren", true, false, getRule().ele010CrossReferenceEStringChild(), getCrossReference$14$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java
index 57c8fab..39e0c0a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java
@@ -155,7 +155,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin
protected int consumeAssignment$16() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele000010CrossReferenceEStringErwachsener(), getCrossReference$17$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "mutter", false, false, getRule().ele000010CrossReferenceEStringErwachsener(), getCrossReference$17$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -165,7 +165,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin
protected int consumeAssignment$19() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, false, false, getRule().ele00010CrossReferenceEStringErwachsener(), getCrossReference$20$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "vater", false, false, getRule().ele00010CrossReferenceEStringErwachsener(), getCrossReference$20$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -175,7 +175,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin
protected int consumeAssignment$22() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele0010CrossReferenceEStringKind(), getCrossReference$23$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "kinder", true, false, getRule().ele0010CrossReferenceEStringKind(), getCrossReference$23$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
@@ -217,7 +217,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin
protected int consumeAssignment$27() throws Exception {
int result = Integer.MIN_VALUE;
int tempResult;
- tempResult = consumeTerminal(idConsumer, null, true, false, getRule().ele0110CrossReferenceEStringKind(), getCrossReference$28$Delimiter());
+ tempResult = consumeTerminal(idConsumer, "kinder", true, false, getRule().ele0110CrossReferenceEStringKind(), getCrossReference$28$Delimiter());
if (tempResult == ConsumeResult.SUCCESS)
return tempResult;
result = tempResult >= result ? tempResult : result;
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 c13ad1a..2e29648 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java
@@ -7,6 +7,8 @@
*******************************************************************************/
package org.eclipse.xtext.parser;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.xtext.parsetree.ParsetreePackage;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.tests.AbstractGeneratorTest;
import org.eclipse.xtext.util.EmfFormater;
@@ -58,11 +60,15 @@ 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(), " ");
-// String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), " ");
-// assertEquals(firstResultAsString, secondResultAsString);
+ String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), getIgnoredFeatures());
+ String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), getIgnoredFeatures());
+ assertEquals(firstResultAsString, secondResultAsString);
}
}
+
+ protected EStructuralFeature[] getIgnoredFeatures() {
+ return new EStructuralFeature[]{ ParsetreePackage.eINSTANCE.getCompositeNode_LookaheadLeafNodes() };
+ }
protected String getFirstParserName() {
return firstParser.getClass().getSimpleName();
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
index e826388..5abc066 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
@@ -38,7 +38,7 @@ public class ComplexReconstrTest extends AbstractGeneratorTest {
if (x instanceof ParserRule) {
ParserRule pr = (ParserRule) x;
if (pr.getName().toLowerCase().contains("tricky")) {
- logger.debug(EmfFormater.objToStr(pr, ""));
+ logger.debug(EmfFormater.objToStr(pr));
}
}
}
@@ -56,7 +56,7 @@ public class ComplexReconstrTest extends AbstractGeneratorTest {
private String parseAndSerialize(String model) throws Exception {
EObject result = (EObject) getModel(model);
if (logger.isDebugEnabled())
- logger.debug(EmfFormater.objToStr(result, ""));
+ logger.debug(EmfFormater.objToStr(result));
return serialize(result);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java
index 61ce74e..0bfe1cc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java
@@ -43,12 +43,11 @@ public class SimpleReconstrTest extends AbstractGeneratorTest {
private String parseAndSerialize(String model) throws Exception {
EObject result = (EObject) getModel(model);
if (logger.isDebugEnabled()) {
- logger.debug(EmfFormater.objToStr(result, ""));
+ logger.debug(EmfFormater.objToStr(result));
logger
- .debug(EmfFormater.objToStr(NodeUtil.getRootNode(result),
- ""));
+ .debug(EmfFormater.objToStr(NodeUtil.getRootNode(result)));
logger.debug(EmfFormater.objToStr(NodeUtil.getRootNode(result)
- .getLeafNodes(), ""));
+ .getLeafNodes()));
}
return serialize(result);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java
index b1cf35b..3cf741f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java
@@ -32,7 +32,7 @@ public class XtextGrammarReconcilationTest extends AbstractGeneratorTest {
// modify first rule
object.getRules().get(0).setName("HONOLULU");
- System.out.println(EmfFormater.objToStr(object, ""));
+ System.out.println(EmfFormater.objToStr(object));
// save
ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java
index 62bb0c4..b03b116 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java
@@ -756,7 +756,7 @@ public class Xtext2EcoreTransformerTest extends AbstractGeneratorTest {
"Number : value=INT;";
EPackage ePackage = getEPackageFromGrammar(grammar);
EClass classifier = (EClass) ePackage.getEClassifier("Ex");
- logger.debug(EmfFormater.objToStr(ePackage, ""));
+ logger.debug(EmfFormater.objToStr(ePackage));
assertEquals(0,classifier.getEStructuralFeatures().size());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java
index 057202d..5e08d03 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java
@@ -41,10 +41,10 @@ public class XtextPackratParserTest extends AbstractGeneratorTest {
assertNotNull(parseResult);
assertNotNull(parseResult.getRootNode());
assertNotNull(parseResult.getRootASTElement());
- String rootNode = EmfFormater.objToStr(parseResult.getRootASTElement(), " ");
+ String rootNode = EmfFormater.objToStr(parseResult.getRootASTElement());
// printParseResult(parseResult);
IParseResult orig = getParser().parse(new StringInputStream(model));
- String origRootNode = EmfFormater.objToStr(orig.getRootASTElement(), " ");
+ String origRootNode = EmfFormater.objToStr(orig.getRootASTElement());
assertEquals("Model: '" + model + "'", origRootNode, rootNode);
}