| author | szarnekow | 2009-02-08 10:12:48 (EST) |
|---|---|---|
| committer | sefftinge | 2009-02-08 10:12:48 (EST) |
| commit | 07c963eabdd9b3948bf8a6f93f3afd013976aa68 (patch) (side-by-side diff) | |
| tree | 3d8a700724cc990f854afb7881f159f700ae1841 | |
| parent | 832354cba2f40f144a7a7e9bdcd41491f53ad675 (diff) | |
| download | org.eclipse.xtext-07c963eabdd9b3948bf8a6f93f3afd013976aa68.zip org.eclipse.xtext-07c963eabdd9b3948bf8a6f93f3afd013976aa68.tar.gz org.eclipse.xtext-07c963eabdd9b3948bf8a6f93f3afd013976aa68.tar.bz2 | |
Fix: Hidden terminals will work for datatype rule, too, code cleanup to remove a bunch of eclipse/compiler warnings
242 files changed, 3039 insertions, 2130 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java index 76d9025..6881167 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java @@ -52,11 +52,11 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(kindConsumer, null, false, false, getRule().ele0ParserRuleCallKind()); + return consumeNonTerminal(kindConsumer, null, false, false, false, getRule().ele0ParserRuleCallKind()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(erwachsenerConsumer, null, false, false, getRule().ele1ParserRuleCallErwachsener()); + return consumeNonTerminal(erwachsenerConsumer, null, false, false, false, getRule().ele1ParserRuleCallErwachsener()); } public PersonElements getRule() { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java index 7c3b7d0..db4e6ed 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java @@ -227,7 +227,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(kindConsumer, "kinder", true, false, getRule().ele0100000ParserRuleCallKind()); + tempResult = consumeNonTerminal(kindConsumer, "kinder", true, false, false, getRule().ele0100000ParserRuleCallKind()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -241,7 +241,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(erwachsenerConsumer, "erzieher", true, false, getRule().ele0100010ParserRuleCallErwachsener()); + tempResult = consumeNonTerminal(erwachsenerConsumer, "erzieher", true, false, false, getRule().ele0100010ParserRuleCallErwachsener()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -255,7 +255,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(spielzeugConsumer, "spielzeuge", true, false, getRule().ele010010ParserRuleCallSpielzeug()); + tempResult = consumeNonTerminal(spielzeugConsumer, "spielzeuge", true, false, false, getRule().ele010010ParserRuleCallSpielzeug()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -269,7 +269,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(familieConsumer, "familie", true, false, getRule().ele01010ParserRuleCallFamilie()); + tempResult = consumeNonTerminal(familieConsumer, "familie", true, false, false, getRule().ele01010ParserRuleCallFamilie()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -283,7 +283,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(customTypeParserRuleConsumer, "types", true, false, getRule().ele0110ParserRuleCallCustomTypeParserRule()); + tempResult = consumeNonTerminal(customTypeParserRuleConsumer, "types", true, false, false, getRule().ele0110ParserRuleCallCustomTypeParserRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java index 7638c61..eb4d337 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java @@ -128,7 +128,7 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(farbeConsumer, "farbe", false, false, getRule().ele010ParserRuleCallFarbe()); + tempResult = consumeNonTerminal(farbeConsumer, "farbe", false, false, false, getRule().ele010ParserRuleCallFarbe()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java index 38f88e9..4bcb073 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java @@ -116,7 +116,7 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele10ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele10ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 51f40c0..f65f7d3 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 @@ -211,7 +211,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(featureConsumer, "features", true, false, getRule().ele010ParserRuleCallFeature()); + tempResult = consumeNonTerminal(featureConsumer, "features", true, false, false, getRule().ele010ParserRuleCallFeature()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java index f0d144a..56f7c9e 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java @@ -52,11 +52,11 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(structuralFeatureConsumer, null, false, false, getRule().ele0ParserRuleCallStructuralFeature()); + return consumeNonTerminal(structuralFeatureConsumer, null, false, false, false, getRule().ele0ParserRuleCallStructuralFeature()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(operationConsumer, null, false, false, getRule().ele1ParserRuleCallOperation()); + return consumeNonTerminal(operationConsumer, null, false, false, false, getRule().ele1ParserRuleCallOperation()); } public FeatureElements getRule() { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java index 6631666..96186ec 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java @@ -76,7 +76,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(importConsumer, "imports", true, false, getRule().ele00ParserRuleCallImport()); + tempResult = consumeNonTerminal(importConsumer, "imports", true, false, false, getRule().ele00ParserRuleCallImport()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -99,7 +99,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedElementConsumer, "namedElements", true, false, getRule().ele10ParserRuleCallNamedElement()); + tempResult = consumeNonTerminal(namedElementConsumer, "namedElements", true, false, false, getRule().ele10ParserRuleCallNamedElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java index 63f13bf..6eb0220 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java @@ -52,11 +52,11 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(packageConsumer, null, false, false, getRule().ele0ParserRuleCallPackage()); + return consumeNonTerminal(packageConsumer, null, false, false, false, getRule().ele0ParserRuleCallPackage()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(typeConsumer, null, false, false, getRule().ele1ParserRuleCallType()); + return consumeNonTerminal(typeConsumer, null, false, false, false, getRule().ele1ParserRuleCallType()); } public NamedElementElements getRule() { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java index 63b0af0..0fb0f52 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java @@ -195,7 +195,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(parameterConsumer, "params", true, false, getRule().ele000100ParserRuleCallParameter()); + tempResult = consumeNonTerminal(parameterConsumer, "params", true, false, false, getRule().ele000100ParserRuleCallParameter()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -253,7 +253,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(parameterConsumer, "params", true, false, getRule().ele0001110ParserRuleCallParameter()); + tempResult = consumeNonTerminal(parameterConsumer, "params", true, false, false, getRule().ele0001110ParserRuleCallParameter()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -275,7 +275,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele10ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele10ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java index f38e3ed..b0a3e7f 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java @@ -107,7 +107,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(qualifiedNameConsumer, "name", false, true, getRule().ele00010ParserRuleCallQualifiedName()); + tempResult = consumeNonTerminal(qualifiedNameConsumer, "name", false, true, false, getRule().ele00010ParserRuleCallQualifiedName()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -134,7 +134,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedElementConsumer, "namedElements", true, false, getRule().ele010ParserRuleCallNamedElement()); + tempResult = consumeNonTerminal(namedElementConsumer, "namedElements", true, false, false, getRule().ele010ParserRuleCallNamedElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java index 7d50db8..5411931 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java @@ -84,7 +84,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele10ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele10ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 361a492..71f62b7 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 @@ -131,7 +131,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele010ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele010ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java index 241dcb0..772cf7b 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java @@ -52,11 +52,11 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(attributeConsumer, null, false, false, getRule().ele0ParserRuleCallAttribute()); + return consumeNonTerminal(attributeConsumer, null, false, false, false, getRule().ele0ParserRuleCallAttribute()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(referenceConsumer, null, false, false, getRule().ele1ParserRuleCallReference()); + return consumeNonTerminal(referenceConsumer, null, false, false, false, getRule().ele1ParserRuleCallReference()); } public StructuralFeatureElements getRule() { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java index fb631cc..eec1636 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java @@ -52,11 +52,11 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(entityConsumer, null, false, false, getRule().ele0ParserRuleCallEntity()); + return consumeNonTerminal(entityConsumer, null, false, false, false, getRule().ele0ParserRuleCallEntity()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(dataTypeConsumer, null, false, false, getRule().ele1ParserRuleCallDataType()); + return consumeNonTerminal(dataTypeConsumer, null, false, false, false, getRule().ele1ParserRuleCallDataType()); } public TypeElements getRule() { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java index 2de8e84..c83fa55 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java @@ -52,11 +52,11 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(featureConsumer, null, false, false, getRule().ele0ParserRuleCallFeature()); + return consumeNonTerminal(featureConsumer, null, false, false, false, getRule().ele0ParserRuleCallFeature()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(parameterConsumer, null, false, false, getRule().ele1ParserRuleCallParameter()); + return consumeNonTerminal(parameterConsumer, null, false, false, false, getRule().ele1ParserRuleCallParameter()); } public TypedElementElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java index 6417dc3..d6d54ed 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java @@ -178,7 +178,7 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(mapEntrySuperConsumer, "contents", true, false, getRule().ele0010ParserRuleCallMapEntrySuper()); + tempResult = consumeNonTerminal(mapEntrySuperConsumer, "contents", true, false, false, getRule().ele0010ParserRuleCallMapEntrySuper()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -236,7 +236,7 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(mapEntrySuperConsumer, "contents", true, false, getRule().ele0110ParserRuleCallMapEntrySuper()); + tempResult = consumeNonTerminal(mapEntrySuperConsumer, "contents", true, false, false, getRule().ele0110ParserRuleCallMapEntrySuper()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java index 7b6de93..a032e7a 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java @@ -189,7 +189,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele00000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele00000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -377,7 +377,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, getRule().ele000010ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, false, getRule().ele000010ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -513,7 +513,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(sintConsumer, "upperBound", false, true, getRule().ele00010110ParserRuleCallSINT()); + tempResult = consumeNonTerminal(sintConsumer, "upperBound", false, true, false, getRule().ele00010110ParserRuleCallSINT()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java index e76f15b..966a7c0 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java @@ -194,7 +194,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele0000000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele0000000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -346,7 +346,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, getRule().ele0000010010ParserRuleCallETypeParameterDecl()); + tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, false, getRule().ele0000010010ParserRuleCallETypeParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -404,7 +404,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, getRule().ele0000010110ParserRuleCallETypeParameterDecl()); + tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, false, getRule().ele0000010110ParserRuleCallETypeParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -476,7 +476,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericSuperTypes", true, false, getRule().ele00001010ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericSuperTypes", true, false, false, getRule().ele00001010ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -534,7 +534,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericSuperTypes", true, false, getRule().ele00001110ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericSuperTypes", true, false, false, getRule().ele00001110ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -593,7 +593,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(stringOrQidConsumer, "instanceClassName", false, true, getRule().ele000110ParserRuleCallSTRING_OR_QID()); + tempResult = consumeNonTerminal(stringOrQidConsumer, "instanceClassName", false, true, false, getRule().ele000110ParserRuleCallSTRING_OR_QID()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -639,7 +639,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eStructuralFeatureDeclConsumer, "eStructuralFeatures", true, false, getRule().ele0100ParserRuleCallEStructuralFeatureDecl()); + tempResult = consumeNonTerminal(eStructuralFeatureDeclConsumer, "eStructuralFeatures", true, false, false, getRule().ele0100ParserRuleCallEStructuralFeatureDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -653,7 +653,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eOperationDeclConsumer, "eOperations", true, false, getRule().ele0110ParserRuleCallEOperationDecl()); + tempResult = consumeNonTerminal(eOperationDeclConsumer, "eOperations", true, false, false, getRule().ele0110ParserRuleCallEOperationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java index 6208983..53275ea 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java @@ -52,11 +52,11 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(eClassDeclConsumer, null, false, false, getRule().ele0ParserRuleCallEClassDecl()); + return consumeNonTerminal(eClassDeclConsumer, null, false, false, false, getRule().ele0ParserRuleCallEClassDecl()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(eDataTypeDeclConsumer, null, false, false, getRule().ele1ParserRuleCallEDataTypeDecl()); + return consumeNonTerminal(eDataTypeDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEDataTypeDecl()); } public EClassifierDeclElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java index e4cec40..94c027f 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java @@ -159,7 +159,7 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele0000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele0000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -219,7 +219,7 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(stringOrQidConsumer, "instanceClassName", false, true, getRule().ele01010ParserRuleCallSTRING_OR_QID()); + tempResult = consumeNonTerminal(stringOrQidConsumer, "instanceClassName", false, true, false, getRule().ele01010ParserRuleCallSTRING_OR_QID()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -234,7 +234,7 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$19(int entryPoint) throws Exception { - return consumeNonTerminal(eEnumDeclConsumer, null, false, false, getRule().ele1ParserRuleCallEEnumDecl()); + return consumeNonTerminal(eEnumDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEEnumDecl()); } public EDataTypeDeclElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java index 87dc841..2765f8e 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java @@ -126,7 +126,7 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -191,7 +191,7 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eEnumLiteralDeclConsumer, "eLiterals", true, false, getRule().ele010ParserRuleCallEEnumLiteralDecl()); + tempResult = consumeNonTerminal(eEnumLiteralDeclConsumer, "eLiterals", true, false, false, getRule().ele010ParserRuleCallEEnumLiteralDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java index 12741f7..4657784 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java @@ -122,7 +122,7 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele00000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele00000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java index 7f7352c..4436973 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java @@ -195,7 +195,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, getRule().ele0010010ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, false, getRule().ele0010010ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -253,7 +253,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, getRule().ele0010110ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, false, getRule().ele0010110ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -409,7 +409,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eUpperBound", false, false, getRule().ele11010ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eUpperBound", false, false, false, getRule().ele11010ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -458,7 +458,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eLowerBound", false, false, getRule().ele11110ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eLowerBound", false, false, false, getRule().ele11110ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java index 40d18ef..cc7cd64 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java @@ -181,7 +181,7 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, getRule().ele010010ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, false, getRule().ele010010ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -239,7 +239,7 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, getRule().ele010110ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eTypeArguments", true, false, false, getRule().ele010110ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java index 4c2a8c3..1db2763 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java @@ -205,7 +205,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele00000000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele00000000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -298,7 +298,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, getRule().ele0000000100ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, false, getRule().ele0000000100ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -393,7 +393,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, getRule().ele0000010010ParserRuleCallETypeParameterDecl()); + tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, false, getRule().ele0000010010ParserRuleCallETypeParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -451,7 +451,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, getRule().ele0000010110ParserRuleCallETypeParameterDecl()); + tempResult = consumeNonTerminal(eTypeParameterDeclConsumer, "eTypeParameters", true, false, false, getRule().ele0000010110ParserRuleCallETypeParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -514,7 +514,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eParameterDeclConsumer, "eParameters", true, false, getRule().ele000100ParserRuleCallEParameterDecl()); + tempResult = consumeNonTerminal(eParameterDeclConsumer, "eParameters", true, false, false, getRule().ele000100ParserRuleCallEParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -572,7 +572,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eParameterDeclConsumer, "eParameters", true, false, getRule().ele0001110ParserRuleCallEParameterDecl()); + tempResult = consumeNonTerminal(eParameterDeclConsumer, "eParameters", true, false, false, getRule().ele0001110ParserRuleCallEParameterDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -644,7 +644,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericExceptions", true, false, getRule().ele01010ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericExceptions", true, false, false, getRule().ele01010ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -702,7 +702,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericExceptions", true, false, getRule().ele01110ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericExceptions", true, false, false, getRule().ele01110ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java index 3db1601..39c1809 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java @@ -196,7 +196,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele000000000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele000000000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -214,7 +214,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(qidConsumer, "name", false, true, getRule().ele00000000010ParserRuleCallQID()); + tempResult = consumeNonTerminal(qidConsumer, "name", false, true, false, getRule().ele00000000010ParserRuleCallQID()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -258,7 +258,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(qidConsumer, "nsPrefix", false, true, getRule().ele00010ParserRuleCallQID()); + tempResult = consumeNonTerminal(qidConsumer, "nsPrefix", false, true, false, getRule().ele00010ParserRuleCallQID()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -304,7 +304,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(subEPackageDeclConsumer, "eSubpackages", true, false, getRule().ele0100ParserRuleCallSubEPackageDecl()); + tempResult = consumeNonTerminal(subEPackageDeclConsumer, "eSubpackages", true, false, false, getRule().ele0100ParserRuleCallSubEPackageDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -318,7 +318,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eClassifierDeclConsumer, "eClassifiers", true, false, getRule().ele0110ParserRuleCallEClassifierDecl()); + tempResult = consumeNonTerminal(eClassifierDeclConsumer, "eClassifiers", true, false, false, getRule().ele0110ParserRuleCallEClassifierDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java index 9609009..603bdef 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java @@ -90,7 +90,7 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -104,7 +104,7 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, getRule().ele010ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, false, getRule().ele010ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java index 06c8aeb..6c6dd89 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java @@ -190,7 +190,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele00000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele00000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -411,7 +411,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, getRule().ele000010ParserRuleCallEGenericTypeReferenceDecl()); + tempResult = consumeNonTerminal(eGenericTypeReferenceDeclConsumer, "eGenericType", false, false, false, getRule().ele000010ParserRuleCallEGenericTypeReferenceDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -547,7 +547,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(sintConsumer, "upperBound", false, true, getRule().ele00010110ParserRuleCallSINT()); + tempResult = consumeNonTerminal(sintConsumer, "upperBound", false, true, false, getRule().ele00010110ParserRuleCallSINT()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java index 143f00f..066079e 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java @@ -52,11 +52,11 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(eAttributeDeclConsumer, null, false, false, getRule().ele0ParserRuleCallEAttributeDecl()); + return consumeNonTerminal(eAttributeDeclConsumer, null, false, false, false, getRule().ele0ParserRuleCallEAttributeDecl()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(eReferenceDeclConsumer, null, false, false, getRule().ele1ParserRuleCallEReferenceDecl()); + return consumeNonTerminal(eReferenceDeclConsumer, null, false, false, false, getRule().ele1ParserRuleCallEReferenceDecl()); } public EStructuralFeatureDeclElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java index 9eaf09c..85d3041 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java @@ -132,7 +132,7 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eBounds", true, false, getRule().ele110ParserRuleCallEGenericTypeDecl()); + tempResult = consumeNonTerminal(eGenericTypeDeclConsumer, "eBounds", true, false, false, getRule().ele110ParserRuleCallEGenericTypeDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java index bd2e99b..766d4b2 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java @@ -76,7 +76,7 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(importStatementDeclConsumer, "imports", true, false, getRule().ele00ParserRuleCallImportStatementDecl()); + tempResult = consumeNonTerminal(importStatementDeclConsumer, "imports", true, false, false, getRule().ele00ParserRuleCallImportStatementDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -90,7 +90,7 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(ePackageDeclConsumer, "package", false, false, getRule().ele10ParserRuleCallEPackageDecl()); + tempResult = consumeNonTerminal(ePackageDeclConsumer, "package", false, false, false, getRule().ele10ParserRuleCallEPackageDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java index 6f01a56..10631ae 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java @@ -31,7 +31,7 @@ public final class EcoreDslMapEntrySuperConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$1(int entryPoint) throws Exception { - return consumeNonTerminal(mapEntryConsumer, null, false, false, getRule().eleParserRuleCallMapEntry()); + return consumeNonTerminal(mapEntryConsumer, null, false, false, false, getRule().eleParserRuleCallMapEntry()); } public MapEntrySuperElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java index c32a8c6..c07bd82 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java @@ -59,7 +59,7 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(qidConsumer, null, false, true, getRule().ele1ParserRuleCallQID()); + return consumeNonTerminal(qidConsumer, null, false, true, false, getRule().ele1ParserRuleCallQID()); } public STRING_OR_QIDElements getRule() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java index 46313d6..fd3a057 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java @@ -128,7 +128,7 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, getRule().ele000000ParserRuleCallEAnnotationDecl()); + tempResult = consumeNonTerminal(eAnnotationDeclConsumer, "eAnnotations", true, false, false, getRule().ele000000ParserRuleCallEAnnotationDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -192,7 +192,7 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(subEPackageDeclConsumer, "eSubpackages", true, false, getRule().ele0100ParserRuleCallSubEPackageDecl()); + tempResult = consumeNonTerminal(subEPackageDeclConsumer, "eSubpackages", true, false, false, getRule().ele0100ParserRuleCallSubEPackageDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -206,7 +206,7 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eClassifierDeclConsumer, "eClassifiers", true, false, getRule().ele0110ParserRuleCallEClassifierDecl()); + tempResult = consumeNonTerminal(eClassifierDeclConsumer, "eClassifiers", true, false, false, getRule().ele0110ParserRuleCallEClassifierDecl()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 bfc1fd4..54c04c0 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 @@ -256,7 +256,7 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(transitionConsumer, "transitions", true, false, getRule().ele010ParserRuleCallTransition()); + tempResult = consumeNonTerminal(transitionConsumer, "transitions", true, false, false, getRule().ele010ParserRuleCallTransition()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java index 1e21971..3827dec 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java @@ -139,7 +139,7 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eventConsumer, "events", true, false, getRule().ele0000010ParserRuleCallEvent()); + tempResult = consumeNonTerminal(eventConsumer, "events", true, false, false, getRule().ele0000010ParserRuleCallEvent()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -170,7 +170,7 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(commandConsumer, "commands", true, false, getRule().ele0010ParserRuleCallCommand()); + tempResult = consumeNonTerminal(commandConsumer, "commands", true, false, false, getRule().ele0010ParserRuleCallCommand()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -197,7 +197,7 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(stateConsumer, "states", true, false, getRule().ele10ParserRuleCallState()); + tempResult = consumeNonTerminal(stateConsumer, "states", true, false, false, getRule().ele10ParserRuleCallState()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java index c623896..19cc47a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java @@ -76,7 +76,7 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(importConsumer, "imports", true, false, getRule().ele00ParserRuleCallImport()); + tempResult = consumeNonTerminal(importConsumer, "imports", true, false, false, getRule().ele00ParserRuleCallImport()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -99,7 +99,7 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeConsumer, "types", true, false, getRule().ele10ParserRuleCallType()); + tempResult = consumeNonTerminal(typeConsumer, "types", true, false, false, getRule().ele10ParserRuleCallType()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java index 36b0fb0..3d79bee 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java @@ -76,7 +76,7 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(importConsumer, "imports", true, false, getRule().ele00ParserRuleCallImport()); + tempResult = consumeNonTerminal(importConsumer, "imports", true, false, false, getRule().ele00ParserRuleCallImport()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -99,7 +99,7 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeConsumer, "types", true, false, getRule().ele10ParserRuleCallType()); + tempResult = consumeNonTerminal(typeConsumer, "types", true, false, false, getRule().ele10ParserRuleCallType()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java index 2f129d9..cfb8fe5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java @@ -43,7 +43,7 @@ public final class DummyTestLanguageModelConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(elementConsumer, "elements", true, false, getRule().ele0ParserRuleCallElement()); + tempResult = consumeNonTerminal(elementConsumer, "elements", true, false, false, getRule().ele0ParserRuleCallElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java index a6ca6b4..943dc9f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallExtendedParserRuleConsumer.java @@ -81,7 +81,7 @@ public final class AbstractTestLanguageAbstractCallExtendedParserRuleConsumer ex int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(extendableParserRuleConsumer, "elements", true, false, getRule().ele10ParserRuleCallExtendableParserRule()); + tempResult = consumeNonTerminal(extendableParserRuleConsumer, "elements", true, false, false, getRule().ele10ParserRuleCallExtendableParserRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java index 5c3c766..8cbca09 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageAbstractCallOverridenParserRuleConsumer.java @@ -81,7 +81,7 @@ public final class AbstractTestLanguageAbstractCallOverridenParserRuleConsumer e int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(overridableParserRuleConsumer, "elements", true, false, getRule().ele10ParserRuleCallOverridableParserRule()); + tempResult = consumeNonTerminal(overridableParserRuleConsumer, "elements", true, false, false, getRule().ele10ParserRuleCallOverridableParserRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java index bd1cdd3..387d1bb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java @@ -125,7 +125,7 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(inheritedParserRuleConsumer, "elements", true, false, getRule().ele10ParserRuleCallInheritedParserRule()); + tempResult = consumeNonTerminal(inheritedParserRuleConsumer, "elements", true, false, false, getRule().ele10ParserRuleCallInheritedParserRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java index f3885a9..71252f2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageRootRuleConsumer.java @@ -31,7 +31,7 @@ public final class ConcreteTestLanguageRootRuleConsumer extends NonTerminalConsu } protected int consumeRuleCall$1(int entryPoint) throws Exception { - return consumeNonTerminal(concreteParserRuleConsumer, null, false, false, getRule().eleParserRuleCallConcreteParserRule()); + return consumeNonTerminal(concreteParserRuleConsumer, null, false, false, false, getRule().eleParserRuleCallConcreteParserRule()); } public RootRuleElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java index 2919371..005e551 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java @@ -93,7 +93,7 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nameRefConsumer, "nameRefs", true, false, getRule().ele10ParserRuleCallNameRef()); + tempResult = consumeNonTerminal(nameRefConsumer, "nameRefs", true, false, false, getRule().ele10ParserRuleCallNameRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java index 840b04d..33b0d1d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java @@ -93,7 +93,7 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nameRefConsumer, "nameRefs", true, false, getRule().ele10ParserRuleCallNameRef()); + tempResult = consumeNonTerminal(nameRefConsumer, "nameRefs", true, false, false, getRule().ele10ParserRuleCallNameRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java index 5cc0da6..c8bc641 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java @@ -63,7 +63,7 @@ public final class DatatypeRulesTestLanguageCompositeModelConsumer extends NonTe int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(modelConsumer, "model", true, false, getRule().ele0ParserRuleCallModel()); + tempResult = consumeNonTerminal(modelConsumer, "model", true, false, false, getRule().ele0ParserRuleCallModel()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java index f74113e..4b2019a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java @@ -110,7 +110,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nestedModelIdConsumer, "id", false, true, getRule().ele00000ParserRuleCallNestedModelId()); + tempResult = consumeNonTerminal(nestedModelIdConsumer, "id", false, true, false, getRule().ele00000ParserRuleCallNestedModelId()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -169,7 +169,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(fractionConsumer, "value", false, true, getRule().ele000110ParserRuleCallFraction()); + tempResult = consumeNonTerminal(fractionConsumer, "value", false, true, false, getRule().ele000110ParserRuleCallFraction()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -228,7 +228,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(vectorConsumer, "vector", false, true, getRule().ele00110ParserRuleCallVector()); + tempResult = consumeNonTerminal(vectorConsumer, "vector", false, true, false, getRule().ele00110ParserRuleCallVector()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -287,7 +287,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(dotsConsumer, "dots", false, true, getRule().ele0110ParserRuleCallDots()); + tempResult = consumeNonTerminal(dotsConsumer, "dots", false, true, false, getRule().ele0110ParserRuleCallDots()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java index e5462b3..b3a0b2e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java @@ -74,7 +74,7 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(modelIdConsumer, null, false, true, getRule().ele00ParserRuleCallModelId()); + return consumeNonTerminal(modelIdConsumer, null, false, true, false, getRule().ele00ParserRuleCallModelId()); } protected int consumeKeyword$4(int entryPoint) throws Exception { @@ -82,7 +82,7 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(modelIdConsumer, null, false, true, getRule().ele1ParserRuleCallModelId()); + return consumeNonTerminal(modelIdConsumer, null, false, true, false, getRule().ele1ParserRuleCallModelId()); } public NestedModelIdElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore index 245e1eb..1c3780a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore @@ -48,10 +48,10 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="rightRoot" eType="//CreatedObject" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedObject"> + <eStructuralFeatures xsi:type="ecore:EReference" name="assignments" unique="false" upperBound="-1" eType="//Assignment" 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="assignments" unique="false" upperBound="-1" eType="//Assignment" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="leftMig" eType="//Migration" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ObjectRef" eSuperTypes="//NamedObject"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java index 8347e45..69f7ed7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java @@ -66,19 +66,19 @@ public final class EpatchTestLanguageAssignmentConsumer extends NonTerminalConsu } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(biSingleAssignmentConsumer, null, false, false, getRule().ele000ParserRuleCallBiSingleAssignment()); + return consumeNonTerminal(biSingleAssignmentConsumer, null, false, false, false, getRule().ele000ParserRuleCallBiSingleAssignment()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(biListAssignmentConsumer, null, false, false, getRule().ele001ParserRuleCallBiListAssignment()); + return consumeNonTerminal(biListAssignmentConsumer, null, false, false, false, getRule().ele001ParserRuleCallBiListAssignment()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(monoSingleAssignmentConsumer, null, false, false, getRule().ele01ParserRuleCallMonoSingleAssignment()); + return consumeNonTerminal(monoSingleAssignmentConsumer, null, false, false, false, getRule().ele01ParserRuleCallMonoSingleAssignment()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(monoListAssignmentConsumer, null, false, false, getRule().ele1ParserRuleCallMonoListAssignment()); + return consumeNonTerminal(monoListAssignmentConsumer, null, false, false, false, getRule().ele1ParserRuleCallMonoListAssignment()); } public AssignmentElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java index 68beb7d..4bca95e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java @@ -297,7 +297,7 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, getRule().ele010ParserRuleCallCreatedObject()); + tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, false, getRule().ele010ParserRuleCallCreatedObject()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java index 3f0d198..8beb4d9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java @@ -208,7 +208,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(listAssignmentValueConsumer, "leftValues", true, false, getRule().ele0000100ParserRuleCallListAssignmentValue()); + tempResult = consumeNonTerminal(listAssignmentValueConsumer, "leftValues", true, false, false, getRule().ele0000100ParserRuleCallListAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -266,7 +266,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(listAssignmentValueConsumer, "leftValues", true, false, getRule().ele00001110ParserRuleCallListAssignmentValue()); + tempResult = consumeNonTerminal(listAssignmentValueConsumer, "leftValues", true, false, false, getRule().ele00001110ParserRuleCallListAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -325,7 +325,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(listAssignmentValueConsumer, "rightValues", true, false, getRule().ele00100ParserRuleCallListAssignmentValue()); + tempResult = consumeNonTerminal(listAssignmentValueConsumer, "rightValues", true, false, false, getRule().ele00100ParserRuleCallListAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -383,7 +383,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(listAssignmentValueConsumer, "rightValues", true, false, getRule().ele001110ParserRuleCallListAssignmentValue()); + tempResult = consumeNonTerminal(listAssignmentValueConsumer, "rightValues", true, false, false, getRule().ele001110ParserRuleCallListAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java index 9aeefb7..ce884f8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java @@ -133,7 +133,7 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "leftValue", false, false, getRule().ele00010ParserRuleCallSingleAssignmentValue()); + tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "leftValue", false, false, false, getRule().ele00010ParserRuleCallSingleAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -151,7 +151,7 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "rightValue", false, false, getRule().ele010ParserRuleCallSingleAssignmentValue()); + tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "rightValue", false, false, false, getRule().ele010ParserRuleCallSingleAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java index 70d3b7b..9b6caee 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java @@ -109,11 +109,11 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(objectNewConsumer, null, false, false, getRule().ele000ParserRuleCallObjectNew()); + return consumeNonTerminal(objectNewConsumer, null, false, false, false, getRule().ele000ParserRuleCallObjectNew()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(objectCopyConsumer, null, false, false, getRule().ele001ParserRuleCallObjectCopy()); + return consumeNonTerminal(objectCopyConsumer, null, false, false, false, getRule().ele001ParserRuleCallObjectCopy()); } protected int consumeAssignment$6(int entryPoint) throws Exception { @@ -255,7 +255,7 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(monoSingleAssignmentConsumer, "assignments", true, false, getRule().ele100100ParserRuleCallMonoSingleAssignment()); + tempResult = consumeNonTerminal(monoSingleAssignmentConsumer, "assignments", true, false, false, getRule().ele100100ParserRuleCallMonoSingleAssignment()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -269,7 +269,7 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(monoListAssignmentConsumer, "assignments", true, false, getRule().ele100110ParserRuleCallMonoListAssignment()); + tempResult = consumeNonTerminal(monoListAssignmentConsumer, "assignments", true, false, false, getRule().ele100110ParserRuleCallMonoListAssignment()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -293,7 +293,7 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(migrationConsumer, "leftMig", false, false, getRule().ele1010ParserRuleCallMigration()); + tempResult = consumeNonTerminal(migrationConsumer, "leftMig", false, false, false, getRule().ele1010ParserRuleCallMigration()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java index 2d61522..4eb1ba5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java @@ -159,7 +159,7 @@ public final class EpatchTestLanguageEPatchConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(importConsumer, "imports", true, false, getRule().ele00010ParserRuleCallImport()); + tempResult = consumeNonTerminal(importConsumer, "imports", true, false, false, getRule().ele00010ParserRuleCallImport()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -182,7 +182,7 @@ public final class EpatchTestLanguageEPatchConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedResourceConsumer, "resources", true, false, getRule().ele0010ParserRuleCallNamedResource()); + tempResult = consumeNonTerminal(namedResourceConsumer, "resources", true, false, false, getRule().ele0010ParserRuleCallNamedResource()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -205,7 +205,7 @@ public final class EpatchTestLanguageEPatchConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(objectRefConsumer, "objects", true, false, getRule().ele010ParserRuleCallObjectRef()); + tempResult = consumeNonTerminal(objectRefConsumer, "objects", true, false, false, getRule().ele010ParserRuleCallObjectRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java index fa500b3..5fcead7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java @@ -52,11 +52,11 @@ public final class EpatchTestLanguageExecutableConsumer extends NonTerminalConsu } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(javaExecutableConsumer, null, false, false, getRule().ele0ParserRuleCallJavaExecutable()); + return consumeNonTerminal(javaExecutableConsumer, null, false, false, false, getRule().ele0ParserRuleCallJavaExecutable()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(expressionExecutableConsumer, null, false, false, getRule().ele1ParserRuleCallExpressionExecutable()); + return consumeNonTerminal(expressionExecutableConsumer, null, false, false, false, getRule().ele1ParserRuleCallExpressionExecutable()); } public ExecutableElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java index 071afc8..79147c8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java @@ -59,15 +59,15 @@ public final class EpatchTestLanguageImportConsumer extends NonTerminalConsumer } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(modelImportConsumer, null, false, false, getRule().ele00ParserRuleCallModelImport()); + return consumeNonTerminal(modelImportConsumer, null, false, false, false, getRule().ele00ParserRuleCallModelImport()); } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(javaImportConsumer, null, false, false, getRule().ele01ParserRuleCallJavaImport()); + return consumeNonTerminal(javaImportConsumer, null, false, false, false, getRule().ele01ParserRuleCallJavaImport()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(extensionImportConsumer, null, false, false, getRule().ele1ParserRuleCallExtensionImport()); + return consumeNonTerminal(extensionImportConsumer, null, false, false, false, getRule().ele1ParserRuleCallExtensionImport()); } public ImportElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java index 7eb223c..8d8fd3a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java @@ -437,7 +437,7 @@ public final class EpatchTestLanguageListAssignmentValueConsumer extends NonTerm int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, getRule().ele1010ParserRuleCallCreatedObject()); + tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, false, getRule().ele1010ParserRuleCallCreatedObject()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java index e9f9d1d..d48f10d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java @@ -109,7 +109,7 @@ public final class EpatchTestLanguageMigrationConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(executableConsumer, "first", false, false, getRule().ele0010ParserRuleCallExecutable()); + tempResult = consumeNonTerminal(executableConsumer, "first", false, false, false, getRule().ele0010ParserRuleCallExecutable()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -187,7 +187,7 @@ public final class EpatchTestLanguageMigrationConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(executableConsumer, "asOp", false, false, getRule().ele01010ParserRuleCallExecutable()); + tempResult = consumeNonTerminal(executableConsumer, "asOp", false, false, false, getRule().ele01010ParserRuleCallExecutable()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -236,7 +236,7 @@ public final class EpatchTestLanguageMigrationConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(executableConsumer, "eachOp", false, false, getRule().ele01110ParserRuleCallExecutable()); + tempResult = consumeNonTerminal(executableConsumer, "eachOp", false, false, false, getRule().ele01110ParserRuleCallExecutable()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java index 1a237b1..47d078a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java @@ -52,11 +52,11 @@ public final class EpatchTestLanguageModelImportConsumer extends NonTerminalCons } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(resourceImportConsumer, null, false, false, getRule().ele0ParserRuleCallResourceImport()); + return consumeNonTerminal(resourceImportConsumer, null, false, false, false, getRule().ele0ParserRuleCallResourceImport()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(ePackageImportConsumer, null, false, false, getRule().ele1ParserRuleCallEPackageImport()); + return consumeNonTerminal(ePackageImportConsumer, null, false, false, false, getRule().ele1ParserRuleCallEPackageImport()); } public ModelImportElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java index c2f7286..db791f3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java @@ -184,7 +184,7 @@ public final class EpatchTestLanguageMonoListAssignmentConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(assignmentValueConsumer, "leftValues", true, false, getRule().ele00100ParserRuleCallAssignmentValue()); + tempResult = consumeNonTerminal(assignmentValueConsumer, "leftValues", true, false, false, getRule().ele00100ParserRuleCallAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -242,7 +242,7 @@ public final class EpatchTestLanguageMonoListAssignmentConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(assignmentValueConsumer, "leftValues", true, false, getRule().ele001110ParserRuleCallAssignmentValue()); + tempResult = consumeNonTerminal(assignmentValueConsumer, "leftValues", true, false, false, getRule().ele001110ParserRuleCallAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java index f9c7691..97abc7a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java @@ -112,7 +112,7 @@ public final class EpatchTestLanguageMonoSingleAssignmentConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "leftValue", false, false, getRule().ele010ParserRuleCallSingleAssignmentValue()); + tempResult = consumeNonTerminal(singleAssignmentValueConsumer, "leftValue", false, false, false, getRule().ele010ParserRuleCallSingleAssignmentValue()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java index 86db1fd..80ea7c8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java @@ -52,11 +52,11 @@ public final class EpatchTestLanguageNamedObjectConsumer extends NonTerminalCons } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(objectRefConsumer, null, false, false, getRule().ele0ParserRuleCallObjectRef()); + return consumeNonTerminal(objectRefConsumer, null, false, false, false, getRule().ele0ParserRuleCallObjectRef()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(createdObjectConsumer, null, false, false, getRule().ele1ParserRuleCallCreatedObject()); + return consumeNonTerminal(createdObjectConsumer, null, false, false, false, getRule().ele1ParserRuleCallCreatedObject()); } public NamedObjectElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java index d9593e4..909ff69 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java @@ -271,7 +271,7 @@ public final class EpatchTestLanguageNamedResourceConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(createdObjectConsumer, "leftRoot", false, false, getRule().ele00000110ParserRuleCallCreatedObject()); + tempResult = consumeNonTerminal(createdObjectConsumer, "leftRoot", false, false, false, getRule().ele00000110ParserRuleCallCreatedObject()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -361,7 +361,7 @@ public final class EpatchTestLanguageNamedResourceConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(createdObjectConsumer, "rightRoot", false, false, getRule().ele00110ParserRuleCallCreatedObject()); + tempResult = consumeNonTerminal(createdObjectConsumer, "rightRoot", false, false, false, getRule().ele00110ParserRuleCallCreatedObject()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java index 2d7e2ca..2751cae 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java @@ -490,7 +490,7 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(biSingleAssignmentConsumer, "assignments", true, false, getRule().ele1000100ParserRuleCallBiSingleAssignment()); + tempResult = consumeNonTerminal(biSingleAssignmentConsumer, "assignments", true, false, false, getRule().ele1000100ParserRuleCallBiSingleAssignment()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -504,7 +504,7 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(biListAssignmentConsumer, "assignments", true, false, getRule().ele1000110ParserRuleCallBiListAssignment()); + tempResult = consumeNonTerminal(biListAssignmentConsumer, "assignments", true, false, false, getRule().ele1000110ParserRuleCallBiListAssignment()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -563,7 +563,7 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(migrationConsumer, "leftMig", false, false, getRule().ele100110ParserRuleCallMigration()); + tempResult = consumeNonTerminal(migrationConsumer, "leftMig", false, false, false, getRule().ele100110ParserRuleCallMigration()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -622,7 +622,7 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(migrationConsumer, "rightMig", false, false, getRule().ele10110ParserRuleCallMigration()); + tempResult = consumeNonTerminal(migrationConsumer, "rightMig", false, false, false, getRule().ele10110ParserRuleCallMigration()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java index 8a55303..9e3d907 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java @@ -319,7 +319,7 @@ public final class EpatchTestLanguageSingleAssignmentValueConsumer extends NonTe int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, getRule().ele010ParserRuleCallCreatedObject()); + tempResult = consumeNonTerminal(createdObjectConsumer, "newObject", false, false, false, getRule().ele010ParserRuleCallCreatedObject()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java index 4d2bb54..5acaaaf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java @@ -52,11 +52,11 @@ public final class XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(generatedMetamodelConsumer, null, false, false, getRule().ele0ParserRuleCallGeneratedMetamodel()); + return consumeNonTerminal(generatedMetamodelConsumer, null, false, false, false, getRule().ele0ParserRuleCallGeneratedMetamodel()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(referencedMetamodelConsumer, null, false, false, getRule().ele1ParserRuleCallReferencedMetamodel()); + return consumeNonTerminal(referencedMetamodelConsumer, null, false, false, false, getRule().ele1ParserRuleCallReferencedMetamodel()); } public AbstractMetamodelDeclarationElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 4a65874..8e6ffa1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -52,11 +52,11 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(negatedTokenConsumer, null, false, false, getRule().ele0ParserRuleCallNegatedToken()); + return consumeNonTerminal(negatedTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallNegatedToken()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, getRule().ele1ParserRuleCallUpToToken()); + return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getRule().ele1ParserRuleCallUpToToken()); } public AbstractNegatedTokenElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java index 7ad7be1..bdd0c66 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java @@ -59,15 +59,15 @@ public final class XtextGrammarTestLanguageAbstractRuleConsumer extends NonTermi } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(lexerRuleConsumer, null, false, false, getRule().ele00ParserRuleCallLexerRule()); + return consumeNonTerminal(lexerRuleConsumer, null, false, false, false, getRule().ele00ParserRuleCallLexerRule()); } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(parserRuleConsumer, null, false, false, getRule().ele01ParserRuleCallParserRule()); + return consumeNonTerminal(parserRuleConsumer, null, false, false, false, getRule().ele01ParserRuleCallParserRule()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(terminalRuleConsumer, null, false, false, getRule().ele1ParserRuleCallTerminalRule()); + return consumeNonTerminal(terminalRuleConsumer, null, false, false, false, getRule().ele1ParserRuleCallTerminalRule()); } public AbstractRuleElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java index 4067fa4..884a051 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java @@ -66,19 +66,19 @@ public final class XtextGrammarTestLanguageAbstractTerminalConsumer extends NonT } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(keywordConsumer, null, false, false, getRule().ele000ParserRuleCallKeyword()); + return consumeNonTerminal(keywordConsumer, null, false, false, false, getRule().ele000ParserRuleCallKeyword()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(ruleCallConsumer, null, false, false, getRule().ele001ParserRuleCallRuleCall()); + return consumeNonTerminal(ruleCallConsumer, null, false, false, false, getRule().ele001ParserRuleCallRuleCall()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(parenthesizedElementConsumer, null, false, false, getRule().ele01ParserRuleCallParenthesizedElement()); + return consumeNonTerminal(parenthesizedElementConsumer, null, false, false, false, getRule().ele01ParserRuleCallParenthesizedElement()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(crossReferenceConsumer, null, false, false, getRule().ele1ParserRuleCallCrossReference()); + return consumeNonTerminal(crossReferenceConsumer, null, false, false, false, getRule().ele1ParserRuleCallCrossReference()); } public AbstractTerminalElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java index efb0c27..3b4b885 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java @@ -99,15 +99,15 @@ public final class XtextGrammarTestLanguageAbstractTokenConsumer extends NonTerm } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(assignmentConsumer, null, false, false, getRule().ele000ParserRuleCallAssignment()); + return consumeNonTerminal(assignmentConsumer, null, false, false, false, getRule().ele000ParserRuleCallAssignment()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(actionConsumer, null, false, false, getRule().ele001ParserRuleCallAction()); + return consumeNonTerminal(actionConsumer, null, false, false, false, getRule().ele001ParserRuleCallAction()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(abstractTerminalConsumer, null, false, false, getRule().ele01ParserRuleCallAbstractTerminal()); + return consumeNonTerminal(abstractTerminalConsumer, null, false, false, false, getRule().ele01ParserRuleCallAbstractTerminal()); } protected int consumeAssignment$7(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java index e938def..f3c0579 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java @@ -201,7 +201,7 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "typeName", false, false, getRule().ele0000010ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "typeName", false, false, false, getRule().ele0000010ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index ac1f91f..2a881e7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -65,7 +65,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(groupConsumer, null, false, false, getRule().ele0ParserRuleCallGroup()); + return consumeNonTerminal(groupConsumer, null, false, false, false, getRule().ele0ParserRuleCallGroup()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -129,7 +129,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(groupConsumer, "groups", true, false, getRule().ele110ParserRuleCallGroup()); + tempResult = consumeNonTerminal(groupConsumer, "groups", true, false, false, getRule().ele110ParserRuleCallGroup()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java index a202847..300b2be 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java @@ -138,7 +138,7 @@ public final class XtextGrammarTestLanguageAssignmentConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractTerminalConsumer, "terminal", false, false, getRule().ele10ParserRuleCallAbstractTerminal()); + tempResult = consumeNonTerminal(abstractTerminalConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallAbstractTerminal()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index cc2ba52..0d3b99d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -65,7 +65,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(keywordConsumer, null, false, false, getRule().ele0ParserRuleCallKeyword()); + return consumeNonTerminal(keywordConsumer, null, false, false, false, getRule().ele0ParserRuleCallKeyword()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -130,7 +130,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(keywordConsumer, "right", false, false, getRule().ele110ParserRuleCallKeyword()); + tempResult = consumeNonTerminal(keywordConsumer, "right", false, false, false, getRule().ele110ParserRuleCallKeyword()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 15a4e73..15ffa14 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 @@ -101,7 +101,7 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele0010ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele0010ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java index 7098fab..c5077b2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java @@ -376,7 +376,7 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractMetamodelDeclarationConsumer, "metamodelDeclarations", true, false, getRule().ele010ParserRuleCallAbstractMetamodelDeclaration()); + tempResult = consumeNonTerminal(abstractMetamodelDeclarationConsumer, "metamodelDeclarations", true, false, false, getRule().ele010ParserRuleCallAbstractMetamodelDeclaration()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -419,7 +419,7 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, getRule().ele10ParserRuleCallAbstractRule()); + tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, false, getRule().ele10ParserRuleCallAbstractRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index 1d5cbd3..f348532 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -62,7 +62,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(abstractTokenConsumer, null, false, false, getRule().ele0ParserRuleCallAbstractToken()); + return consumeNonTerminal(abstractTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallAbstractToken()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractTokenConsumer, "abstractTokens", true, false, getRule().ele110ParserRuleCallAbstractToken()); + tempResult = consumeNonTerminal(abstractTokenConsumer, "abstractTokens", true, false, false, getRule().ele110ParserRuleCallAbstractToken()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java index 991fbf9..1eb4b54 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java @@ -212,7 +212,7 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java index b7bf287..e756312 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java @@ -72,7 +72,7 @@ public final class XtextGrammarTestLanguageNegatedTokenConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); + tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java index 563749b..411fcef 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java @@ -81,7 +81,7 @@ public final class XtextGrammarTestLanguageParenthesizedElementConsumer extends } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(alternativesConsumer, null, false, false, getRule().ele01ParserRuleCallAlternatives()); + return consumeNonTerminal(alternativesConsumer, null, false, false, false, getRule().ele01ParserRuleCallAlternatives()); } protected int consumeKeyword$5(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java index 0278a28..559d27a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java @@ -81,7 +81,7 @@ public final class XtextGrammarTestLanguageParenthesizedTerminalElementConsumer } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(terminalAlternativesConsumer, null, false, false, getRule().ele01ParserRuleCallTerminalAlternatives()); + return consumeNonTerminal(terminalAlternativesConsumer, null, false, false, false, getRule().ele01ParserRuleCallTerminalAlternatives()); } protected int consumeKeyword$5(int entryPoint) throws Exception { 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 3db16ca..7157c43 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 @@ -194,7 +194,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele0000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele0000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -343,7 +343,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(alternativesConsumer, "alternatives", false, false, getRule().ele010ParserRuleCallAlternatives()); + tempResult = consumeNonTerminal(alternativesConsumer, "alternatives", false, false, false, getRule().ele010ParserRuleCallAlternatives()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index 8cb1b48..9284c38 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -65,7 +65,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalGroupConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalGroup()); + return consumeNonTerminal(terminalGroupConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalGroup()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -129,7 +129,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalGroupConsumer, "groups", true, false, getRule().ele110ParserRuleCallTerminalGroup()); + tempResult = consumeNonTerminal(terminalGroupConsumer, "groups", true, false, false, getRule().ele110ParserRuleCallTerminalGroup()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index 7a54aa6..173d45e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -62,7 +62,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalTokenConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalToken()); + return consumeNonTerminal(terminalTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalToken()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenConsumer, "abstractTokens", true, false, getRule().ele110ParserRuleCallTerminalToken()); + tempResult = consumeNonTerminal(terminalTokenConsumer, "abstractTokens", true, false, false, getRule().ele110ParserRuleCallTerminalToken()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java index ebc35d3..7af1dd4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java @@ -193,7 +193,7 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -211,7 +211,7 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalAlternativesConsumer, "alternatives", false, false, getRule().ele010ParserRuleCallTerminalAlternatives()); + tempResult = consumeNonTerminal(terminalAlternativesConsumer, "alternatives", false, false, false, getRule().ele010ParserRuleCallTerminalAlternatives()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java index dfdd9e3..9fbc740 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java @@ -71,7 +71,7 @@ public final class XtextGrammarTestLanguageTerminalTokenConsumer extends NonTerm } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalTokenElementConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalTokenElement()); + return consumeNonTerminal(terminalTokenElementConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalTokenElement()); } protected int consumeAssignment$3(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java index dba1b33..5557b95 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java @@ -73,23 +73,23 @@ public final class XtextGrammarTestLanguageTerminalTokenElementConsumer extends } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(characterRangeConsumer, null, false, false, getRule().ele0000ParserRuleCallCharacterRange()); + return consumeNonTerminal(characterRangeConsumer, null, false, false, false, getRule().ele0000ParserRuleCallCharacterRange()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(ruleCallConsumer, null, false, false, getRule().ele0001ParserRuleCallRuleCall()); + return consumeNonTerminal(ruleCallConsumer, null, false, false, false, getRule().ele0001ParserRuleCallRuleCall()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(parenthesizedTerminalElementConsumer, null, false, false, getRule().ele001ParserRuleCallParenthesizedTerminalElement()); + return consumeNonTerminal(parenthesizedTerminalElementConsumer, null, false, false, false, getRule().ele001ParserRuleCallParenthesizedTerminalElement()); } protected int consumeRuleCall$8(int entryPoint) throws Exception { - return consumeNonTerminal(abstractNegatedTokenConsumer, null, false, false, getRule().ele01ParserRuleCallAbstractNegatedToken()); + return consumeNonTerminal(abstractNegatedTokenConsumer, null, false, false, false, getRule().ele01ParserRuleCallAbstractNegatedToken()); } protected int consumeRuleCall$9(int entryPoint) throws Exception { - return consumeNonTerminal(wildcardConsumer, null, false, false, getRule().ele1ParserRuleCallWildcard()); + return consumeNonTerminal(wildcardConsumer, null, false, false, false, getRule().ele1ParserRuleCallWildcard()); } public TerminalTokenElementElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java index 033f5e6..c1a495a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java @@ -72,7 +72,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); + tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.ecore index 8b93482..cb036ce 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.ecore @@ -26,6 +26,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="called" eType="//InheritingHiddensCall" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="hidingCalled" eType="//HidingHiddens" containment="true"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="DatatypeHiddens" eSuperTypes="//Model"/> <eClassifiers xsi:type="ecore:EClass" name="HidingHiddens"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="space"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi index 8f4d589..fac7ca2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi @@ -20,12 +20,15 @@ <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Alternatives"> - <groups xsi:type="xtext:RuleCall" rule="//@rules.1"/> - <groups xsi:type="xtext:RuleCall" rule="//@rules.2"/> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:RuleCall" rule="//@rules.1"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.2"/> + </groups> + <groups xsi:type="xtext:RuleCall" rule="//@rules.3"/> </groups> - <groups xsi:type="xtext:RuleCall" rule="//@rules.3"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.5"/> </groups> - <groups xsi:type="xtext:RuleCall" rule="//@rules.5"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.6"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="WithoutHiddens"> @@ -38,13 +41,13 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="without"/> <abstractTokens xsi:type="xtext:Assignment" feature="spaces" operator="+="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="hiddens"/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="spaces" operator="+="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="valid" operator="?="> @@ -52,7 +55,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="WithHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.10 //@rules.8 //@rules.9"> + <rules xsi:type="xtext:ParserRule" name="WithHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.12 //@rules.10 //@rules.11"> <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest#//WithHiddens"/> </type> @@ -66,7 +69,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="OverridingHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.10 //@rules.8 //@rules.9"> + <rules xsi:type="xtext:ParserRule" name="OverridingHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.12 //@rules.10 //@rules.11"> <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest#//OverridingHiddens"/> </type> @@ -99,7 +102,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="call"/> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="spaces" operator="+="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="valid" operator="?="> @@ -107,7 +110,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="InheritingHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.10 //@rules.8 //@rules.9"> + <rules xsi:type="xtext:ParserRule" name="InheritingHiddens" definesHiddenTokens="true" hiddenTokens="//@rules.12 //@rules.10 //@rules.11"> <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest#//InheritingHiddens"/> </type> @@ -123,10 +126,10 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="called" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.9"/> </groups> <groups xsi:type="xtext:Assignment" feature="hidingCalled" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.6"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> </groups> </abstractTokens> </abstractTokens> @@ -137,6 +140,26 @@ </abstractTokens> </alternatives> </rules> + <rules xsi:type="xtext:ParserRule" name="DatatypeHiddens"> + <type metamodel="//@metamodelDeclarations.1"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest#//DatatypeHiddens"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="datatype"/> + <abstractTokens xsi:type="xtext:Assignment" feature="valid" operator="?="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + </abstractTokens> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="DatatypeRule" definesHiddenTokens="true" hiddenTokens="//@rules.12"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="rule"/> + <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </alternatives> + </rules> <rules xsi:type="xtext:ParserRule" name="HidingHiddens" definesHiddenTokens="true"> <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest#//HidingHiddens"/> @@ -145,11 +168,11 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="hiding"/> <abstractTokens xsi:type="xtext:Assignment" feature="space" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="called" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.9"/> </abstractTokens> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore index 64ced3d..54d3239 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore @@ -20,12 +20,12 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration"> - <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g index 9852976..2e25752 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g @@ -78,9 +78,9 @@ ruleModel returns [EObject current=null] } @after { resetLookahead(); }: -((( +(((( { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); } this_WithoutHiddens=ruleWithoutHiddens { @@ -90,7 +90,7 @@ ruleModel returns [EObject current=null] | { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); } this_WithHiddens=ruleWithHiddens { @@ -100,7 +100,7 @@ ruleModel returns [EObject current=null] ) | { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); } this_OverridingHiddens=ruleOverridingHiddens { @@ -110,13 +110,23 @@ ruleModel returns [EObject current=null] ) | { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); } this_InheritingHiddens=ruleInheritingHiddens { $current = $this_InheritingHiddens.current; currentNode = currentNode.getParent(); } +) + | + { + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); + } + this_DatatypeHiddens=ruleDatatypeHiddens + { + $current = $this_DatatypeHiddens.current; + currentNode = currentNode.getParent(); + } ); @@ -519,9 +529,93 @@ ruleInheritingHiddens returns [EObject current=null] +// Entry rule entryRuleDatatypeHiddens +entryRuleDatatypeHiddens returns [EObject current=null] : + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); } + iv_ruleDatatypeHiddens=ruleDatatypeHiddens + { $current=$iv_ruleDatatypeHiddens.current; } + EOF +; + +// Rule DatatypeHiddens +ruleDatatypeHiddens returns [EObject current=null] + @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); + } + @after { resetLookahead(); + }: +('datatype' + { + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + } +( + + + { + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + } + lv_valid=ruleDatatypeRule + { + if ($current==null) { + $current = factory.create("DatatypeHiddens"); + associateNodeWithAstElement(currentNode.getParent(), $current); + } + + try { + factory.set($current, "valid", true, "DatatypeRule", currentNode); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + currentNode = currentNode.getParent(); + } + +)); + + + + + + + +// Entry rule entryRuleDatatypeRule +entryRuleDatatypeRule returns [String current=null] : + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); } + iv_ruleDatatypeRule=ruleDatatypeRule + { $current=$iv_ruleDatatypeRule.current.getText(); } + EOF +; + +// Rule DatatypeRule +ruleDatatypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); + HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS"); + } + @after { resetLookahead(); + myHiddenTokenState.restore(); + }: +( + kw='rule' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + } + + kw=';' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); + } +) + ; + + + + + + + // Entry rule entryRuleHidingHiddens entryRuleHidingHiddens returns [EObject current=null] : - { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); } + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8" /* xtext::ParserRule */, currentNode); } iv_ruleHidingHiddens=ruleHidingHiddens { $current=$iv_ruleHidingHiddens.current; } EOF @@ -537,13 +631,13 @@ ruleHidingHiddens returns [EObject current=null] }: (('hiding' { - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); } ( lv_space=RULE_WS { - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "space"); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "space"); } { @@ -563,7 +657,7 @@ ruleHidingHiddens returns [EObject current=null] { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); } lv_called=ruleInheritingHiddensCall { @@ -590,7 +684,7 @@ ruleHidingHiddens returns [EObject current=null] // Entry rule entryRuleInheritingHiddensCall entryRuleInheritingHiddensCall returns [EObject current=null] : - { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); } + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9" /* xtext::ParserRule */, currentNode); } iv_ruleInheritingHiddensCall=ruleInheritingHiddensCall { $current=$iv_ruleInheritingHiddensCall.current; } EOF @@ -604,13 +698,13 @@ ruleInheritingHiddensCall returns [EObject current=null] }: ('call' { - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); } ( lv_valid=';' { - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); } { @@ -660,6 +754,10 @@ ruleInheritingHiddensCall returns [EObject current=null] + + + + RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.tokens index 41eaec6..daf7f1d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.tokens +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.tokens @@ -5,9 +5,11 @@ RULE_SL_COMMENT=6 '('=13 'hiddens'=9 ')'=14 -'hiding'=17 +'rule'=18 +'hiding'=19 'call'=15 'without'=8 +'datatype'=17 'overriding'=12 'with'=11 'inheriting'=16 diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageLexer.java index f2d6f59..c5be2d8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageLexer.java @@ -11,22 +11,24 @@ import java.util.List; import java.util.ArrayList; public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { - public static final int T10=10; public static final int RULE_ML_COMMENT=5; public static final int T14=14; - public static final int RULE_WS=4; public static final int T11=11; public static final int T9=9; + public static final int T12=12; + public static final int T13=13; + public static final int T10=10; + public static final int T18=18; + public static final int RULE_WS=4; public static final int T15=15; public static final int EOF=-1; public static final int T17=17; - public static final int T12=12; - public static final int Tokens=18; + public static final int Tokens=20; public static final int RULE_ANY_OTHER=7; public static final int T16=16; - public static final int T8=8; public static final int RULE_SL_COMMENT=6; - public static final int T13=13; + public static final int T8=8; + public static final int T19=19; public InternalHiddenTerminalsTestLanguageLexer() {;} public InternalHiddenTerminalsTestLanguageLexer(CharStream input) { super(input); @@ -205,10 +207,10 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { public final void mT17() throws RecognitionException { try { int _type = T17; - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:19:5: ( 'hiding' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:19:7: 'hiding' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:19:5: ( 'datatype' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:19:7: 'datatype' { - match("hiding"); + match("datatype"); } @@ -220,16 +222,54 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } // $ANTLR end T17 + // $ANTLR start T18 + public final void mT18() throws RecognitionException { + try { + int _type = T18; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:20:5: ( 'rule' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:20:7: 'rule' + { + match("rule"); + + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T18 + + // $ANTLR start T19 + public final void mT19() throws RecognitionException { + try { + int _type = T19; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:21:5: ( 'hiding' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:21:7: 'hiding' + { + match("hiding"); + + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T19 + // $ANTLR start RULE_ML_COMMENT public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:663:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:663:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:761:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:761:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:663:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:761:24: ( options {greedy=false; } : . )* loop1: do { int alt1=2; @@ -254,7 +294,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { switch (alt1) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:663:52: . + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:761:52: . { matchAny(); @@ -282,12 +322,12 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:24: (~ ( ( '\\n' | '\\r' ) ) )* loop2: do { int alt2=2; @@ -300,7 +340,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { switch (alt2) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -321,7 +361,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:40: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:40: ( ( '\\r' )? '\\n' )? int alt4=2; int LA4_0 = input.LA(1); @@ -330,9 +370,9 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } switch (alt4) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:41: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:41: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:41: ( '\\r' )? + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:41: ( '\\r' )? int alt3=2; int LA3_0 = input.LA(1); @@ -341,7 +381,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } switch (alt3) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:667:41: '\\r' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:765:41: '\\r' { match('\r'); @@ -371,10 +411,10 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:671:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:671:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:769:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:769:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:671:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:769:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ int cnt5=0; loop5: do { @@ -427,8 +467,8 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:675:16: ( . ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:675:18: . + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:773:16: ( . ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:773:18: . { matchAny(); @@ -442,23 +482,23 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { // $ANTLR end RULE_ANY_OTHER public void mTokens() throws RecognitionException { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:8: ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt6=14; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:8: ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt6=16; int LA6_0 = input.LA(1); if ( (LA6_0=='w') ) { int LA6_1 = input.LA(2); if ( (LA6_1=='i') ) { - int LA6_12 = input.LA(3); + int LA6_14 = input.LA(3); - if ( (LA6_12=='t') ) { - int LA6_23 = input.LA(4); + if ( (LA6_14=='t') ) { + int LA6_27 = input.LA(4); - if ( (LA6_23=='h') ) { - int LA6_25 = input.LA(5); + if ( (LA6_27=='h') ) { + int LA6_29 = input.LA(5); - if ( (LA6_25=='o') ) { + if ( (LA6_29=='o') ) { alt6=1; } else { @@ -466,52 +506,52 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 23, input); + new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 27, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 12, input); + new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 14, input); throw nvae; } } else { - alt6=14;} + alt6=16;} } else if ( (LA6_0=='h') ) { int LA6_2 = input.LA(2); if ( (LA6_2=='i') ) { - int LA6_13 = input.LA(3); + int LA6_15 = input.LA(3); - if ( (LA6_13=='d') ) { - int LA6_24 = input.LA(4); + if ( (LA6_15=='d') ) { + int LA6_28 = input.LA(4); - if ( (LA6_24=='d') ) { + if ( (LA6_28=='d') ) { alt6=2; } - else if ( (LA6_24=='i') ) { - alt6=10; + else if ( (LA6_28=='i') ) { + alt6=12; } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 24, input); + new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 28, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 13, input); + new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 15, input); throw nvae; } } else { - alt6=14;} + alt6=16;} } else if ( (LA6_0==';') ) { alt6=3; @@ -523,7 +563,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { alt6=5; } else { - alt6=14;} + alt6=16;} } else if ( (LA6_0=='(') ) { alt6=6; @@ -538,7 +578,7 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { alt6=8; } else { - alt6=14;} + alt6=16;} } else if ( (LA6_0=='i') ) { int LA6_8 = input.LA(2); @@ -547,33 +587,51 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { alt6=9; } else { - alt6=14;} + alt6=16;} + } + else if ( (LA6_0=='d') ) { + int LA6_9 = input.LA(2); + + if ( (LA6_9=='a') ) { + alt6=10; + } + else { + alt6=16;} + } + else if ( (LA6_0=='r') ) { + int LA6_10 = input.LA(2); + + if ( (LA6_10=='u') ) { + alt6=11; + } + else { + alt6=16;} } else if ( (LA6_0=='/') ) { switch ( input.LA(2) ) { - case '/': + case '*': { - alt6=12; + alt6=13; } break; - case '*': + case '/': { - alt6=11; + alt6=14; } break; default: - alt6=14;} + alt6=16;} } else if ( ((LA6_0>='\t' && LA6_0<='\n')||LA6_0=='\r'||LA6_0==' ') ) { - alt6=13; + alt6=15; } - else if ( ((LA6_0>='\u0000' && LA6_0<='\b')||(LA6_0>='\u000B' && LA6_0<='\f')||(LA6_0>='\u000E' && LA6_0<='\u001F')||(LA6_0>='!' && LA6_0<='\'')||(LA6_0>='*' && LA6_0<='.')||(LA6_0>='0' && LA6_0<=':')||(LA6_0>='<' && LA6_0<='b')||(LA6_0>='d' && LA6_0<='g')||(LA6_0>='j' && LA6_0<='n')||(LA6_0>='p' && LA6_0<='v')||(LA6_0>='x' && LA6_0<='\uFFFE')) ) { - alt6=14; + else if ( ((LA6_0>='\u0000' && LA6_0<='\b')||(LA6_0>='\u000B' && LA6_0<='\f')||(LA6_0>='\u000E' && LA6_0<='\u001F')||(LA6_0>='!' && LA6_0<='\'')||(LA6_0>='*' && LA6_0<='.')||(LA6_0>='0' && LA6_0<=':')||(LA6_0>='<' && LA6_0<='b')||(LA6_0>='e' && LA6_0<='g')||(LA6_0>='j' && LA6_0<='n')||(LA6_0>='p' && LA6_0<='q')||(LA6_0>='s' && LA6_0<='v')||(LA6_0>='x' && LA6_0<='\uFFFE')) ) { + alt6=16; } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 0, input); + new NoViableAltException("1:1: Tokens : ( T8 | T9 | T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 6, 0, input); throw nvae; } @@ -649,28 +707,42 @@ public class InternalHiddenTerminalsTestLanguageLexer extends Lexer { } break; case 11 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:48: RULE_ML_COMMENT + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:48: T18 { - mRULE_ML_COMMENT(); + mT18(); } break; case 12 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:64: RULE_SL_COMMENT + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:52: T19 { - mRULE_SL_COMMENT(); + mT19(); } break; case 13 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:80: RULE_WS + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:56: RULE_ML_COMMENT { - mRULE_WS(); + mRULE_ML_COMMENT(); } break; case 14 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:88: RULE_ANY_OTHER + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:72: RULE_SL_COMMENT + { + mRULE_SL_COMMENT(); + + } + break; + case 15 : + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:88: RULE_WS + { + mRULE_WS(); + + } + break; + case 16 : + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:1:96: RULE_ANY_OTHER { mRULE_ANY_OTHER(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageParser.java index bd4ee33..da07fc1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageParser.java @@ -22,7 +22,7 @@ import java.util.ArrayList; public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ANY_OTHER", "'without'", "'hiddens'", "';'", "'with'", "'overriding'", "'('", "')'", "'call'", "'inheriting'", "'hiding'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ANY_OTHER", "'without'", "'hiddens'", "';'", "'with'", "'overriding'", "'('", "')'", "'call'", "'inheriting'", "'datatype'", "'rule'", "'hiding'" }; public static final int RULE_ML_COMMENT=5; public static final int RULE_WS=4; @@ -95,7 +95,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleModel - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:76:1: ruleModel returns [EObject current=null] : ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:76:1: ruleModel returns [EObject current=null] : ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) | this_DatatypeHiddens= ruleDatatypeHiddens ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -107,99 +107,144 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA EObject this_InheritingHiddens = null; + EObject this_DatatypeHiddens = null; + EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:80:6: ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:1: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:80:6: ( ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) | this_DatatypeHiddens= ruleDatatypeHiddens ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:1: ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) | this_DatatypeHiddens= ruleDatatypeHiddens ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:1: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) - int alt3=2; - int LA3_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:1: ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) | this_DatatypeHiddens= ruleDatatypeHiddens ) + int alt4=2; + int LA4_0 = input.LA(1); - if ( (LA3_0==8||(LA3_0>=11 && LA3_0<=12)) ) { - alt3=1; + if ( (LA4_0==8||(LA4_0>=11 && LA4_0<=12)||LA4_0==16) ) { + alt4=1; } - else if ( (LA3_0==16) ) { - alt3=2; + else if ( (LA4_0==17) ) { + alt4=2; } else { NoViableAltException nvae = - new NoViableAltException("81:1: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens )", 3, 0, input); + new NoViableAltException("81:1: ( ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) | this_DatatypeHiddens= ruleDatatypeHiddens )", 4, 0, input); throw nvae; } - switch (alt3) { + switch (alt4) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:2: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:2: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:2: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) - int alt2=2; - int LA2_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:2: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens ) + int alt3=2; + int LA3_0 = input.LA(1); - if ( (LA2_0==8||LA2_0==11) ) { - alt2=1; + if ( (LA3_0==8||(LA3_0>=11 && LA3_0<=12)) ) { + alt3=1; } - else if ( (LA2_0==12) ) { - alt2=2; + else if ( (LA3_0==16) ) { + alt3=2; } else { NoViableAltException nvae = - new NoViableAltException("81:2: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens )", 2, 0, input); + new NoViableAltException("81:2: ( ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) | this_InheritingHiddens= ruleInheritingHiddens )", 3, 0, input); throw nvae; } - switch (alt2) { + switch (alt3) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:3: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:3: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:3: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) - int alt1=2; - int LA1_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:3: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens ) + int alt2=2; + int LA2_0 = input.LA(1); - if ( (LA1_0==8) ) { - alt1=1; + if ( (LA2_0==8||LA2_0==11) ) { + alt2=1; } - else if ( (LA1_0==11) ) { - alt1=2; + else if ( (LA2_0==12) ) { + alt2=2; } else { NoViableAltException nvae = - new NoViableAltException("81:3: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens )", 1, 0, input); + new NoViableAltException("81:3: ( (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) | this_OverridingHiddens= ruleOverridingHiddens )", 2, 0, input); throw nvae; } - switch (alt1) { + switch (alt2) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:82:5: this_WithoutHiddens= ruleWithoutHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:4: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) { - - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); - - pushFollow(FOLLOW_ruleWithoutHiddens_in_ruleModel131); - this_WithoutHiddens=ruleWithoutHiddens(); - _fsp--; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:81:4: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens ) + int alt1=2; + int LA1_0 = input.LA(1); + + if ( (LA1_0==8) ) { + alt1=1; + } + else if ( (LA1_0==11) ) { + alt1=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("81:4: (this_WithoutHiddens= ruleWithoutHiddens | this_WithHiddens= ruleWithHiddens )", 1, 0, input); + + throw nvae; + } + switch (alt1) { + case 1 : + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:82:5: this_WithoutHiddens= ruleWithoutHiddens + { + + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); + + pushFollow(FOLLOW_ruleWithoutHiddens_in_ruleModel132); + this_WithoutHiddens=ruleWithoutHiddens(); + _fsp--; + + + current = this_WithoutHiddens; + currentNode = currentNode.getParent(); + + + } + break; + case 2 : + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:92:5: this_WithHiddens= ruleWithHiddens + { + + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); + + pushFollow(FOLLOW_ruleWithHiddens_in_ruleModel159); + this_WithHiddens=ruleWithHiddens(); + _fsp--; + + + current = this_WithHiddens; + currentNode = currentNode.getParent(); + + + } + break; + + } - - current = this_WithoutHiddens; - currentNode = currentNode.getParent(); - } break; case 2 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:92:5: this_WithHiddens= ruleWithHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:102:5: this_OverridingHiddens= ruleOverridingHiddens { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleWithHiddens_in_ruleModel158); - this_WithHiddens=ruleWithHiddens(); + pushFollow(FOLLOW_ruleOverridingHiddens_in_ruleModel187); + this_OverridingHiddens=ruleOverridingHiddens(); _fsp--; - current = this_WithHiddens; + current = this_OverridingHiddens; currentNode = currentNode.getParent(); @@ -212,17 +257,17 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } break; case 2 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:102:5: this_OverridingHiddens= ruleOverridingHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:112:5: this_InheritingHiddens= ruleInheritingHiddens { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleOverridingHiddens_in_ruleModel186); - this_OverridingHiddens=ruleOverridingHiddens(); + pushFollow(FOLLOW_ruleInheritingHiddens_in_ruleModel215); + this_InheritingHiddens=ruleInheritingHiddens(); _fsp--; - current = this_OverridingHiddens; + current = this_InheritingHiddens; currentNode = currentNode.getParent(); @@ -235,17 +280,17 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } break; case 2 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:112:5: this_InheritingHiddens= ruleInheritingHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:122:5: this_DatatypeHiddens= ruleDatatypeHiddens { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.0/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleInheritingHiddens_in_ruleModel214); - this_InheritingHiddens=ruleInheritingHiddens(); + pushFollow(FOLLOW_ruleDatatypeHiddens_in_ruleModel243); + this_DatatypeHiddens=ruleDatatypeHiddens(); _fsp--; - current = this_InheritingHiddens; + current = this_DatatypeHiddens; currentNode = currentNode.getParent(); @@ -273,7 +318,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleWithoutHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:129:1: entryRuleWithoutHiddens returns [EObject current=null] : iv_ruleWithoutHiddens= ruleWithoutHiddens EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:139:1: entryRuleWithoutHiddens returns [EObject current=null] : iv_ruleWithoutHiddens= ruleWithoutHiddens EOF ; public final EObject entryRuleWithoutHiddens() throws RecognitionException { EObject current = null; @@ -281,16 +326,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:129:56: (iv_ruleWithoutHiddens= ruleWithoutHiddens EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:130:2: iv_ruleWithoutHiddens= ruleWithoutHiddens EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:139:56: (iv_ruleWithoutHiddens= ruleWithoutHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:140:2: iv_ruleWithoutHiddens= ruleWithoutHiddens EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleWithoutHiddens_in_entryRuleWithoutHiddens248); + pushFollow(FOLLOW_ruleWithoutHiddens_in_entryRuleWithoutHiddens277); iv_ruleWithoutHiddens=ruleWithoutHiddens(); _fsp--; current =iv_ruleWithoutHiddens; - match(input,EOF,FOLLOW_EOF_in_entryRuleWithoutHiddens258); + match(input,EOF,FOLLOW_EOF_in_entryRuleWithoutHiddens287); } @@ -308,7 +353,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleWithoutHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:137:1: ruleWithoutHiddens returns [EObject current=null] : ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:147:1: ruleWithoutHiddens returns [EObject current=null] : ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ; public final EObject ruleWithoutHiddens() throws RecognitionException { EObject current = null; @@ -318,30 +363,30 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:141:6: ( ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:1: ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:151:6: ( ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:1: ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:1: ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:2: ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:1: ( ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:2: ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:2: ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:3: ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:2: ( ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:3: ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) (lv_spaces= RULE_WS )? { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:3: ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:4: ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:3: ( ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:4: ( 'without' (lv_spaces= RULE_WS ) ) 'hiddens' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:4: ( 'without' (lv_spaces= RULE_WS ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:142:5: 'without' (lv_spaces= RULE_WS ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:4: ( 'without' (lv_spaces= RULE_WS ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:152:5: 'without' (lv_spaces= RULE_WS ) { - match(input,8,FOLLOW_8_in_ruleWithoutHiddens295); + match(input,8,FOLLOW_8_in_ruleWithoutHiddens324); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:146:1: (lv_spaces= RULE_WS ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:148:6: lv_spaces= RULE_WS + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:156:1: (lv_spaces= RULE_WS ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:158:6: lv_spaces= RULE_WS { lv_spaces=(Token)input.LT(1); - match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleWithoutHiddens316); + match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleWithoutHiddens345); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "spaces"); @@ -363,26 +408,26 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - match(input,9,FOLLOW_9_in_ruleWithoutHiddens337); + match(input,9,FOLLOW_9_in_ruleWithoutHiddens366); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:170:2: (lv_spaces= RULE_WS )? - int alt4=2; - int LA4_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:180:2: (lv_spaces= RULE_WS )? + int alt5=2; + int LA5_0 = input.LA(1); - if ( (LA4_0==RULE_WS) ) { - alt4=1; + if ( (LA5_0==RULE_WS) ) { + alt5=1; } - switch (alt4) { + switch (alt5) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:172:6: lv_spaces= RULE_WS + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:182:6: lv_spaces= RULE_WS { lv_spaces=(Token)input.LT(1); - match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleWithoutHiddens359); + match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleWithoutHiddens388); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "spaces"); @@ -407,11 +452,11 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:190:4: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:192:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:200:4: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:202:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleWithoutHiddens393); + match(input,10,FOLLOW_10_in_ruleWithoutHiddens422); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); @@ -452,7 +497,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleWithHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:219:1: entryRuleWithHiddens returns [EObject current=null] : iv_ruleWithHiddens= ruleWithHiddens EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:229:1: entryRuleWithHiddens returns [EObject current=null] : iv_ruleWithHiddens= ruleWithHiddens EOF ; public final EObject entryRuleWithHiddens() throws RecognitionException { EObject current = null; @@ -460,16 +505,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:219:53: (iv_ruleWithHiddens= ruleWithHiddens EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:220:2: iv_ruleWithHiddens= ruleWithHiddens EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:229:53: (iv_ruleWithHiddens= ruleWithHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:230:2: iv_ruleWithHiddens= ruleWithHiddens EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleWithHiddens_in_entryRuleWithHiddens440); + pushFollow(FOLLOW_ruleWithHiddens_in_entryRuleWithHiddens469); iv_ruleWithHiddens=ruleWithHiddens(); _fsp--; current =iv_ruleWithHiddens; - match(input,EOF,FOLLOW_EOF_in_entryRuleWithHiddens450); + match(input,EOF,FOLLOW_EOF_in_entryRuleWithHiddens479); } @@ -487,7 +532,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleWithHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:227:1: ruleWithHiddens returns [EObject current=null] : ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:237:1: ruleWithHiddens returns [EObject current=null] : ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) ; public final EObject ruleWithHiddens() throws RecognitionException { EObject current = null; @@ -497,31 +542,31 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:233:6: ( ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:234:1: ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:243:6: ( ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:1: ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:234:1: ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:234:2: ( 'with' 'hiddens' ) (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:1: ( ( 'with' 'hiddens' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:2: ( 'with' 'hiddens' ) (lv_valid= ';' ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:234:2: ( 'with' 'hiddens' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:234:3: 'with' 'hiddens' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:2: ( 'with' 'hiddens' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:3: 'with' 'hiddens' { - match(input,11,FOLLOW_11_in_ruleWithHiddens485); + match(input,11,FOLLOW_11_in_ruleWithHiddens514); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,9,FOLLOW_9_in_ruleWithHiddens494); + match(input,9,FOLLOW_9_in_ruleWithHiddens523); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:242:2: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:244:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:252:2: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:254:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleWithHiddens516); + match(input,10,FOLLOW_10_in_ruleWithHiddens545); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); @@ -563,7 +608,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleOverridingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:271:1: entryRuleOverridingHiddens returns [EObject current=null] : iv_ruleOverridingHiddens= ruleOverridingHiddens EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:281:1: entryRuleOverridingHiddens returns [EObject current=null] : iv_ruleOverridingHiddens= ruleOverridingHiddens EOF ; public final EObject entryRuleOverridingHiddens() throws RecognitionException { EObject current = null; @@ -571,16 +616,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:271:59: (iv_ruleOverridingHiddens= ruleOverridingHiddens EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:272:2: iv_ruleOverridingHiddens= ruleOverridingHiddens EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:281:59: (iv_ruleOverridingHiddens= ruleOverridingHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:282:2: iv_ruleOverridingHiddens= ruleOverridingHiddens EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleOverridingHiddens_in_entryRuleOverridingHiddens563); + pushFollow(FOLLOW_ruleOverridingHiddens_in_entryRuleOverridingHiddens592); iv_ruleOverridingHiddens=ruleOverridingHiddens(); _fsp--; current =iv_ruleOverridingHiddens; - match(input,EOF,FOLLOW_EOF_in_entryRuleOverridingHiddens573); + match(input,EOF,FOLLOW_EOF_in_entryRuleOverridingHiddens602); } @@ -598,7 +643,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleOverridingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:279:1: ruleOverridingHiddens returns [EObject current=null] : ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:289:1: ruleOverridingHiddens returns [EObject current=null] : ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) ; public final EObject ruleOverridingHiddens() throws RecognitionException { EObject current = null; @@ -610,49 +655,49 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:285:6: ( ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:1: ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:295:6: ( ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:1: ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:1: ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:2: ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:1: ( ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:2: ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) (lv_valid= ';' ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:2: ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:3: ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:2: ( ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:3: ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) ')' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:3: ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:4: ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:3: ( ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:4: ( ( 'overriding' 'hiddens' ) '(' ) (lv_called= ruleOverridingHiddensCall ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:4: ( ( 'overriding' 'hiddens' ) '(' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:5: ( 'overriding' 'hiddens' ) '(' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:4: ( ( 'overriding' 'hiddens' ) '(' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:5: ( 'overriding' 'hiddens' ) '(' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:5: ( 'overriding' 'hiddens' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:286:6: 'overriding' 'hiddens' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:5: ( 'overriding' 'hiddens' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:296:6: 'overriding' 'hiddens' { - match(input,12,FOLLOW_12_in_ruleOverridingHiddens611); + match(input,12,FOLLOW_12_in_ruleOverridingHiddens640); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,9,FOLLOW_9_in_ruleOverridingHiddens620); + match(input,9,FOLLOW_9_in_ruleOverridingHiddens649); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - match(input,13,FOLLOW_13_in_ruleOverridingHiddens630); + match(input,13,FOLLOW_13_in_ruleOverridingHiddens659); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:298:2: (lv_called= ruleOverridingHiddensCall ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:301:6: lv_called= ruleOverridingHiddensCall + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:308:2: (lv_called= ruleOverridingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:311:6: lv_called= ruleOverridingHiddensCall { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleOverridingHiddensCall_in_ruleOverridingHiddens665); + pushFollow(FOLLOW_ruleOverridingHiddensCall_in_ruleOverridingHiddens694); lv_called=ruleOverridingHiddensCall(); _fsp--; @@ -675,18 +720,18 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - match(input,14,FOLLOW_14_in_ruleOverridingHiddens679); + match(input,14,FOLLOW_14_in_ruleOverridingHiddens708); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:323:2: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:325:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:333:2: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:335:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleOverridingHiddens701); + match(input,10,FOLLOW_10_in_ruleOverridingHiddens730); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); @@ -728,7 +773,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleOverridingHiddensCall - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:352:1: entryRuleOverridingHiddensCall returns [EObject current=null] : iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:362:1: entryRuleOverridingHiddensCall returns [EObject current=null] : iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF ; public final EObject entryRuleOverridingHiddensCall() throws RecognitionException { EObject current = null; @@ -736,16 +781,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:352:63: (iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:353:2: iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:362:63: (iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:363:2: iv_ruleOverridingHiddensCall= ruleOverridingHiddensCall EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleOverridingHiddensCall_in_entryRuleOverridingHiddensCall748); + pushFollow(FOLLOW_ruleOverridingHiddensCall_in_entryRuleOverridingHiddensCall777); iv_ruleOverridingHiddensCall=ruleOverridingHiddensCall(); _fsp--; current =iv_ruleOverridingHiddensCall; - match(input,EOF,FOLLOW_EOF_in_entryRuleOverridingHiddensCall758); + match(input,EOF,FOLLOW_EOF_in_entryRuleOverridingHiddensCall787); } @@ -763,7 +808,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleOverridingHiddensCall - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:360:1: ruleOverridingHiddensCall returns [EObject current=null] : ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:370:1: ruleOverridingHiddensCall returns [EObject current=null] : ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ; public final EObject ruleOverridingHiddensCall() throws RecognitionException { EObject current = null; @@ -774,32 +819,32 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens(); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:366:6: ( ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:367:1: ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:376:6: ( ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:377:1: ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:367:1: ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:367:2: ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:377:1: ( ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:377:2: ( 'call' (lv_spaces= RULE_WS )? ) (lv_valid= ';' ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:367:2: ( 'call' (lv_spaces= RULE_WS )? ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:367:3: 'call' (lv_spaces= RULE_WS )? + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:377:2: ( 'call' (lv_spaces= RULE_WS )? ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:377:3: 'call' (lv_spaces= RULE_WS )? { - match(input,15,FOLLOW_15_in_ruleOverridingHiddensCall793); + match(input,15,FOLLOW_15_in_ruleOverridingHiddensCall822); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:371:1: (lv_spaces= RULE_WS )? - int alt5=2; - int LA5_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:381:1: (lv_spaces= RULE_WS )? + int alt6=2; + int LA6_0 = input.LA(1); - if ( (LA5_0==RULE_WS) ) { - alt5=1; + if ( (LA6_0==RULE_WS) ) { + alt6=1; } - switch (alt5) { + switch (alt6) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:373:6: lv_spaces= RULE_WS + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:383:6: lv_spaces= RULE_WS { lv_spaces=(Token)input.LT(1); - match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleOverridingHiddensCall814); + match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleOverridingHiddensCall843); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "spaces"); @@ -824,11 +869,11 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:391:4: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:393:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:401:4: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:403:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleOverridingHiddensCall848); + match(input,10,FOLLOW_10_in_ruleOverridingHiddensCall877); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); @@ -870,7 +915,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleInheritingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:420:1: entryRuleInheritingHiddens returns [EObject current=null] : iv_ruleInheritingHiddens= ruleInheritingHiddens EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:430:1: entryRuleInheritingHiddens returns [EObject current=null] : iv_ruleInheritingHiddens= ruleInheritingHiddens EOF ; public final EObject entryRuleInheritingHiddens() throws RecognitionException { EObject current = null; @@ -878,16 +923,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:420:59: (iv_ruleInheritingHiddens= ruleInheritingHiddens EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:421:2: iv_ruleInheritingHiddens= ruleInheritingHiddens EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:430:59: (iv_ruleInheritingHiddens= ruleInheritingHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:431:2: iv_ruleInheritingHiddens= ruleInheritingHiddens EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleInheritingHiddens_in_entryRuleInheritingHiddens895); + pushFollow(FOLLOW_ruleInheritingHiddens_in_entryRuleInheritingHiddens924); iv_ruleInheritingHiddens=ruleInheritingHiddens(); _fsp--; current =iv_ruleInheritingHiddens; - match(input,EOF,FOLLOW_EOF_in_entryRuleInheritingHiddens905); + match(input,EOF,FOLLOW_EOF_in_entryRuleInheritingHiddens934); } @@ -905,7 +950,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleInheritingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:428:1: ruleInheritingHiddens returns [EObject current=null] : ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:438:1: ruleInheritingHiddens returns [EObject current=null] : ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) ; public final EObject ruleInheritingHiddens() throws RecognitionException { EObject current = null; @@ -919,69 +964,69 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:434:6: ( ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:1: ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:444:6: ( ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:1: ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:1: ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:2: ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:1: ( ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:2: ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) (lv_valid= ';' ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:2: ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:3: ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:2: ( ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:3: ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) ')' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:3: ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:4: ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:3: ( ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:4: ( ( 'inheriting' 'hiddens' ) '(' ) ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:4: ( ( 'inheriting' 'hiddens' ) '(' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:5: ( 'inheriting' 'hiddens' ) '(' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:4: ( ( 'inheriting' 'hiddens' ) '(' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:5: ( 'inheriting' 'hiddens' ) '(' { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:5: ( 'inheriting' 'hiddens' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:435:6: 'inheriting' 'hiddens' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:5: ( 'inheriting' 'hiddens' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:445:6: 'inheriting' 'hiddens' { - match(input,16,FOLLOW_16_in_ruleInheritingHiddens943); + match(input,16,FOLLOW_16_in_ruleInheritingHiddens972); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,9,FOLLOW_9_in_ruleInheritingHiddens952); + match(input,9,FOLLOW_9_in_ruleInheritingHiddens981); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - match(input,13,FOLLOW_13_in_ruleInheritingHiddens962); + match(input,13,FOLLOW_13_in_ruleInheritingHiddens991); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:447:2: ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) - int alt6=2; - int LA6_0 = input.LA(1); + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:457:2: ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) ) + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA6_0==15) ) { - alt6=1; + if ( (LA7_0==15) ) { + alt7=1; } - else if ( (LA6_0==17) ) { - alt6=2; + else if ( (LA7_0==19) ) { + alt7=2; } else { NoViableAltException nvae = - new NoViableAltException("447:2: ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) )", 6, 0, input); + new NoViableAltException("457:2: ( (lv_called= ruleInheritingHiddensCall ) | (lv_hidingCalled= ruleHidingHiddens ) )", 7, 0, input); throw nvae; } - switch (alt6) { + switch (alt7) { case 1 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:447:3: (lv_called= ruleInheritingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:457:3: (lv_called= ruleInheritingHiddensCall ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:447:3: (lv_called= ruleInheritingHiddensCall ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:450:6: lv_called= ruleInheritingHiddensCall + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:457:3: (lv_called= ruleInheritingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:460:6: lv_called= ruleInheritingHiddensCall { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@groups.0/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleInheritingHiddensCall_in_ruleInheritingHiddens998); + pushFollow(FOLLOW_ruleInheritingHiddensCall_in_ruleInheritingHiddens1027); lv_called=ruleInheritingHiddensCall(); _fsp--; @@ -1005,15 +1050,15 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } break; case 2 : - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:469:6: (lv_hidingCalled= ruleHidingHiddens ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:479:6: (lv_hidingCalled= ruleHidingHiddens ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:469:6: (lv_hidingCalled= ruleHidingHiddens ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:472:6: lv_hidingCalled= ruleHidingHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:479:6: (lv_hidingCalled= ruleHidingHiddens ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:482:6: lv_hidingCalled= ruleHidingHiddens { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleHidingHiddens_in_ruleInheritingHiddens1042); + pushFollow(FOLLOW_ruleHidingHiddens_in_ruleInheritingHiddens1071); lv_hidingCalled=ruleHidingHiddens(); _fsp--; @@ -1042,18 +1087,18 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - match(input,14,FOLLOW_14_in_ruleInheritingHiddens1057); + match(input,14,FOLLOW_14_in_ruleInheritingHiddens1086); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:494:2: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:496:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:504:2: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:506:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleInheritingHiddens1079); + match(input,10,FOLLOW_10_in_ruleInheritingHiddens1108); createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); @@ -1094,8 +1139,197 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR end ruleInheritingHiddens + // $ANTLR start entryRuleDatatypeHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:533:1: entryRuleDatatypeHiddens returns [EObject current=null] : iv_ruleDatatypeHiddens= ruleDatatypeHiddens EOF ; + public final EObject entryRuleDatatypeHiddens() throws RecognitionException { + EObject current = null; + + EObject iv_ruleDatatypeHiddens = null; + + + try { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:533:57: (iv_ruleDatatypeHiddens= ruleDatatypeHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:534:2: iv_ruleDatatypeHiddens= ruleDatatypeHiddens EOF + { + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleDatatypeHiddens_in_entryRuleDatatypeHiddens1155); + iv_ruleDatatypeHiddens=ruleDatatypeHiddens(); + _fsp--; + + current =iv_ruleDatatypeHiddens; + match(input,EOF,FOLLOW_EOF_in_entryRuleDatatypeHiddens1165); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end entryRuleDatatypeHiddens + + + // $ANTLR start ruleDatatypeHiddens + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:541:1: ruleDatatypeHiddens returns [EObject current=null] : ( 'datatype' (lv_valid= ruleDatatypeRule ) ) ; + public final EObject ruleDatatypeHiddens() throws RecognitionException { + EObject current = null; + + AntlrDatatypeRuleToken lv_valid = null; + + + EObject temp=null; setCurrentLookahead(); resetLookahead(); + + try { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:545:6: ( ( 'datatype' (lv_valid= ruleDatatypeRule ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:546:1: ( 'datatype' (lv_valid= ruleDatatypeRule ) ) + { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:546:1: ( 'datatype' (lv_valid= ruleDatatypeRule ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:546:2: 'datatype' (lv_valid= ruleDatatypeRule ) + { + match(input,17,FOLLOW_17_in_ruleDatatypeHiddens1199); + + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:550:1: (lv_valid= ruleDatatypeRule ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:553:6: lv_valid= ruleDatatypeRule + { + + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + + pushFollow(FOLLOW_ruleDatatypeRule_in_ruleDatatypeHiddens1233); + lv_valid=ruleDatatypeRule(); + _fsp--; + + + if (current==null) { + current = factory.create("DatatypeHiddens"); + associateNodeWithAstElement(currentNode.getParent(), current); + } + + try { + factory.set(current, "valid", true, "DatatypeRule", currentNode); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + currentNode = currentNode.getParent(); + + + } + + + } + + + } + + resetLookahead(); + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end ruleDatatypeHiddens + + + // $ANTLR start entryRuleDatatypeRule + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:580:1: entryRuleDatatypeRule returns [String current=null] : iv_ruleDatatypeRule= ruleDatatypeRule EOF ; + public final String entryRuleDatatypeRule() throws RecognitionException { + String current = null; + + AntlrDatatypeRuleToken iv_ruleDatatypeRule = null; + + + try { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:580:53: (iv_ruleDatatypeRule= ruleDatatypeRule EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:581:2: iv_ruleDatatypeRule= ruleDatatypeRule EOF + { + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleDatatypeRule_in_entryRuleDatatypeRule1273); + iv_ruleDatatypeRule=ruleDatatypeRule(); + _fsp--; + + current =iv_ruleDatatypeRule.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleDatatypeRule1284); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end entryRuleDatatypeRule + + + // $ANTLR start ruleDatatypeRule + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:588:1: ruleDatatypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'rule' kw= ';' ) ; + public final AntlrDatatypeRuleToken ruleDatatypeRule() throws RecognitionException { + AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); + + Token kw=null; + + setCurrentLookahead(); resetLookahead(); + HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS"); + + try { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:594:6: ( (kw= 'rule' kw= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:595:1: (kw= 'rule' kw= ';' ) + { + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:595:1: (kw= 'rule' kw= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:596:2: kw= 'rule' kw= ';' + { + kw=(Token)input.LT(1); + match(input,18,FOLLOW_18_in_ruleDatatypeRule1322); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + + kw=(Token)input.LT(1); + match(input,10,FOLLOW_10_in_ruleDatatypeRule1335); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); + + + } + + + } + + resetLookahead(); + myHiddenTokenState.restore(); + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end ruleDatatypeRule + + // $ANTLR start entryRuleHidingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:523:1: entryRuleHidingHiddens returns [EObject current=null] : iv_ruleHidingHiddens= ruleHidingHiddens EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:617:1: entryRuleHidingHiddens returns [EObject current=null] : iv_ruleHidingHiddens= ruleHidingHiddens EOF ; public final EObject entryRuleHidingHiddens() throws RecognitionException { EObject current = null; @@ -1103,16 +1337,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:523:55: (iv_ruleHidingHiddens= ruleHidingHiddens EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:524:2: iv_ruleHidingHiddens= ruleHidingHiddens EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:617:55: (iv_ruleHidingHiddens= ruleHidingHiddens EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:618:2: iv_ruleHidingHiddens= ruleHidingHiddens EOF { - currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleHidingHiddens_in_entryRuleHidingHiddens1126); + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleHidingHiddens_in_entryRuleHidingHiddens1375); iv_ruleHidingHiddens=ruleHidingHiddens(); _fsp--; current =iv_ruleHidingHiddens; - match(input,EOF,FOLLOW_EOF_in_entryRuleHidingHiddens1136); + match(input,EOF,FOLLOW_EOF_in_entryRuleHidingHiddens1385); } @@ -1130,7 +1364,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleHidingHiddens - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:531:1: ruleHidingHiddens returns [EObject current=null] : ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:625:1: ruleHidingHiddens returns [EObject current=null] : ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) ; public final EObject ruleHidingHiddens() throws RecognitionException { EObject current = null; @@ -1142,26 +1376,26 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens(); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:537:6: ( ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:538:1: ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:631:6: ( ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:632:1: ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:538:1: ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:538:2: ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:632:1: ( ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:632:2: ( 'hiding' (lv_space= RULE_WS ) ) (lv_called= ruleInheritingHiddensCall ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:538:2: ( 'hiding' (lv_space= RULE_WS ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:538:3: 'hiding' (lv_space= RULE_WS ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:632:2: ( 'hiding' (lv_space= RULE_WS ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:632:3: 'hiding' (lv_space= RULE_WS ) { - match(input,17,FOLLOW_17_in_ruleHidingHiddens1171); + match(input,19,FOLLOW_19_in_ruleHidingHiddens1420); - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:542:1: (lv_space= RULE_WS ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:544:6: lv_space= RULE_WS + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:636:1: (lv_space= RULE_WS ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:638:6: lv_space= RULE_WS { lv_space=(Token)input.LT(1); - match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleHidingHiddens1192); + match(input,RULE_WS,FOLLOW_RULE_WS_in_ruleHidingHiddens1441); - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "space"); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "space"); if (current==null) { @@ -1181,13 +1415,13 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA } - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:562:3: (lv_called= ruleInheritingHiddensCall ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:565:6: lv_called= ruleInheritingHiddensCall + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:656:3: (lv_called= ruleInheritingHiddensCall ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:659:6: lv_called= ruleInheritingHiddensCall { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleInheritingHiddensCall_in_ruleHidingHiddens1238); + pushFollow(FOLLOW_ruleInheritingHiddensCall_in_ruleHidingHiddens1487); lv_called=ruleInheritingHiddensCall(); _fsp--; @@ -1230,7 +1464,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start entryRuleInheritingHiddensCall - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:592:1: entryRuleInheritingHiddensCall returns [EObject current=null] : iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:686:1: entryRuleInheritingHiddensCall returns [EObject current=null] : iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF ; public final EObject entryRuleInheritingHiddensCall() throws RecognitionException { EObject current = null; @@ -1238,16 +1472,16 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:592:63: (iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:593:2: iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:686:63: (iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:687:2: iv_ruleInheritingHiddensCall= ruleInheritingHiddensCall EOF { - currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleInheritingHiddensCall_in_entryRuleInheritingHiddensCall1277); + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleInheritingHiddensCall_in_entryRuleInheritingHiddensCall1526); iv_ruleInheritingHiddensCall=ruleInheritingHiddensCall(); _fsp--; current =iv_ruleInheritingHiddensCall; - match(input,EOF,FOLLOW_EOF_in_entryRuleInheritingHiddensCall1287); + match(input,EOF,FOLLOW_EOF_in_entryRuleInheritingHiddensCall1536); } @@ -1265,7 +1499,7 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA // $ANTLR start ruleInheritingHiddensCall - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:600:1: ruleInheritingHiddensCall returns [EObject current=null] : ( 'call' (lv_valid= ';' ) ) ; + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:694:1: ruleInheritingHiddensCall returns [EObject current=null] : ( 'call' (lv_valid= ';' ) ) ; public final EObject ruleInheritingHiddensCall() throws RecognitionException { EObject current = null; @@ -1274,23 +1508,23 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:604:6: ( ( 'call' (lv_valid= ';' ) ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:605:1: ( 'call' (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:698:6: ( ( 'call' (lv_valid= ';' ) ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:699:1: ( 'call' (lv_valid= ';' ) ) { - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:605:1: ( 'call' (lv_valid= ';' ) ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:605:2: 'call' (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:699:1: ( 'call' (lv_valid= ';' ) ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:699:2: 'call' (lv_valid= ';' ) { - match(input,15,FOLLOW_15_in_ruleInheritingHiddensCall1321); + match(input,15,FOLLOW_15_in_ruleInheritingHiddensCall1570); - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:609:1: (lv_valid= ';' ) - // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:611:6: lv_valid= ';' + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:703:1: (lv_valid= ';' ) + // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g:705:6: lv_valid= ';' { lv_valid=(Token)input.LT(1); - match(input,10,FOLLOW_10_in_ruleInheritingHiddensCall1342); + match(input,10,FOLLOW_10_in_ruleInheritingHiddensCall1591); - createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); + createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@terminal" /* xtext::Keyword */, "valid"); if (current==null) { @@ -1332,52 +1566,61 @@ public class InternalHiddenTerminalsTestLanguageParser extends AbstractInternalA public static final BitSet FOLLOW_ruleModel_in_entryRuleModel72 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleModel82 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWithoutHiddens_in_ruleModel131 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWithHiddens_in_ruleModel158 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOverridingHiddens_in_ruleModel186 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleInheritingHiddens_in_ruleModel214 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWithoutHiddens_in_entryRuleWithoutHiddens248 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleWithoutHiddens258 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_8_in_ruleWithoutHiddens295 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_WS_in_ruleWithoutHiddens316 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_9_in_ruleWithoutHiddens337 = new BitSet(new long[]{0x0000000000000410L}); - public static final BitSet FOLLOW_RULE_WS_in_ruleWithoutHiddens359 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleWithoutHiddens393 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWithHiddens_in_entryRuleWithHiddens440 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleWithHiddens450 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_11_in_ruleWithHiddens485 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_9_in_ruleWithHiddens494 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleWithHiddens516 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOverridingHiddens_in_entryRuleOverridingHiddens563 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleOverridingHiddens573 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_ruleOverridingHiddens611 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_9_in_ruleOverridingHiddens620 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleOverridingHiddens630 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_ruleOverridingHiddensCall_in_ruleOverridingHiddens665 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleOverridingHiddens679 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleOverridingHiddens701 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOverridingHiddensCall_in_entryRuleOverridingHiddensCall748 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleOverridingHiddensCall758 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_ruleOverridingHiddensCall793 = new BitSet(new long[]{0x0000000000000410L}); - public static final BitSet FOLLOW_RULE_WS_in_ruleOverridingHiddensCall814 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleOverridingHiddensCall848 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleInheritingHiddens_in_entryRuleInheritingHiddens895 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleInheritingHiddens905 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_ruleInheritingHiddens943 = new BitSet(new long[]{0x0000000000000200L}); - public static final BitSet FOLLOW_9_in_ruleInheritingHiddens952 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleInheritingHiddens962 = new BitSet(new long[]{0x0000000000028000L}); - public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_ruleInheritingHiddens998 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_ruleHidingHiddens_in_ruleInheritingHiddens1042 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_14_in_ruleInheritingHiddens1057 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleInheritingHiddens1079 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleHidingHiddens_in_entryRuleHidingHiddens1126 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleHidingHiddens1136 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleHidingHiddens1171 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_WS_in_ruleHidingHiddens1192 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_ruleHidingHiddens1238 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_entryRuleInheritingHiddensCall1277 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleInheritingHiddensCall1287 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_ruleInheritingHiddensCall1321 = new BitSet(new long[]{0x0000000000000400L}); - public static final BitSet FOLLOW_10_in_ruleInheritingHiddensCall1342 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWithoutHiddens_in_ruleModel132 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWithHiddens_in_ruleModel159 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOverridingHiddens_in_ruleModel187 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleInheritingHiddens_in_ruleModel215 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDatatypeHiddens_in_ruleModel243 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWithoutHiddens_in_entryRuleWithoutHiddens277 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleWithoutHiddens287 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_8_in_ruleWithoutHiddens324 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_WS_in_ruleWithoutHiddens345 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_9_in_ruleWithoutHiddens366 = new BitSet(new long[]{0x0000000000000410L}); + public static final BitSet FOLLOW_RULE_WS_in_ruleWithoutHiddens388 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleWithoutHiddens422 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWithHiddens_in_entryRuleWithHiddens469 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleWithHiddens479 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleWithHiddens514 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_9_in_ruleWithHiddens523 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleWithHiddens545 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOverridingHiddens_in_entryRuleOverridingHiddens592 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleOverridingHiddens602 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_ruleOverridingHiddens640 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_9_in_ruleOverridingHiddens649 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleOverridingHiddens659 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_ruleOverridingHiddensCall_in_ruleOverridingHiddens694 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_14_in_ruleOverridingHiddens708 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleOverridingHiddens730 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOverridingHiddensCall_in_entryRuleOverridingHiddensCall777 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleOverridingHiddensCall787 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleOverridingHiddensCall822 = new BitSet(new long[]{0x0000000000000410L}); + public static final BitSet FOLLOW_RULE_WS_in_ruleOverridingHiddensCall843 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleOverridingHiddensCall877 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleInheritingHiddens_in_entryRuleInheritingHiddens924 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleInheritingHiddens934 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_ruleInheritingHiddens972 = new BitSet(new long[]{0x0000000000000200L}); + public static final BitSet FOLLOW_9_in_ruleInheritingHiddens981 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleInheritingHiddens991 = new BitSet(new long[]{0x0000000000088000L}); + public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_ruleInheritingHiddens1027 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_ruleHidingHiddens_in_ruleInheritingHiddens1071 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_14_in_ruleInheritingHiddens1086 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleInheritingHiddens1108 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDatatypeHiddens_in_entryRuleDatatypeHiddens1155 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDatatypeHiddens1165 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleDatatypeHiddens1199 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_ruleDatatypeRule_in_ruleDatatypeHiddens1233 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDatatypeRule_in_entryRuleDatatypeRule1273 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDatatypeRule1284 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleDatatypeRule1322 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleDatatypeRule1335 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleHidingHiddens_in_entryRuleHidingHiddens1375 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleHidingHiddens1385 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleHidingHiddens1420 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_WS_in_ruleHidingHiddens1441 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_ruleHidingHiddens1487 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleInheritingHiddensCall_in_entryRuleInheritingHiddensCall1526 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleInheritingHiddensCall1536 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleInheritingHiddensCall1570 = new BitSet(new long[]{0x0000000000000400L}); + public static final BitSet FOLLOW_10_in_ruleInheritingHiddensCall1591 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage__.g index 13c63bf..f7dafa1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage__.g @@ -16,24 +16,26 @@ T13 : '(' ; T14 : ')' ; T15 : 'call' ; T16 : 'inheriting' ; -T17 : 'hiding' ; +T17 : 'datatype' ; +T18 : 'rule' ; +T19 : 'hiding' ; -// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 663 +// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 761 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; -// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 667 +// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 765 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; -// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 671 +// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 769 RULE_WS : (((' '|'\t')|'\r')|'\n')+; -// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 675 +// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g" 773 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageDelimiters.java index 52e9ec7..587387c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageDelimiters.java @@ -13,8 +13,8 @@ public final class HiddenTerminalsTestLanguageDelimiters { throw new UnsupportedOperationException("Utility classes may not be initialized"); } - public static ICharacterClass keyword$17$Delimiter = ICharacterClass.Factory.nullClass(); + public static ICharacterClass keyword$19$Delimiter = ICharacterClass.Factory.nullClass(); - public static ISequenceMatcher ruleCall$19$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + public static ISequenceMatcher ruleCall$21$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java index 142ab4f..74e3237 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java @@ -12,6 +12,8 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTer import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageOverridingHiddensConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageOverridingHiddensCallConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageInheritingHiddensConsumer; +import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageDatatypeHiddensConsumer; +import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageDatatypeRuleConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageHidingHiddensConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageInheritingHiddensCallConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageML_COMMENTConsumer; @@ -28,6 +30,8 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars private HiddenTerminalsTestLanguageOverridingHiddensConsumer overridingHiddensConsumer; private HiddenTerminalsTestLanguageOverridingHiddensCallConsumer overridingHiddensCallConsumer; private HiddenTerminalsTestLanguageInheritingHiddensConsumer inheritingHiddensConsumer; + private HiddenTerminalsTestLanguageDatatypeHiddensConsumer datatypeHiddensConsumer; + private HiddenTerminalsTestLanguageDatatypeRuleConsumer datatypeRuleConsumer; private HiddenTerminalsTestLanguageHidingHiddensConsumer hidingHiddensConsumer; private HiddenTerminalsTestLanguageInheritingHiddensCallConsumer inheritingHiddensCallConsumer; private HiddenTerminalsTestLanguageML_COMMENTConsumer mlCommentConsumer; @@ -62,6 +66,12 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars inheritingHiddensConsumer = new HiddenTerminalsTestLanguageInheritingHiddensConsumer( this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); + datatypeHiddensConsumer = new HiddenTerminalsTestLanguageDatatypeHiddensConsumer( + this, null + ); + datatypeRuleConsumer = new HiddenTerminalsTestLanguageDatatypeRuleConsumer( + this, new ITerminalConsumer[]{ getWsConsumer() } + ); hidingHiddensConsumer = new HiddenTerminalsTestLanguageHidingHiddensConsumer( this, new ITerminalConsumer[]{ } ); @@ -78,6 +88,7 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars } public void configureConsumers() { + getModelConsumer().setDatatypeHiddensConsumer(getDatatypeHiddensConsumer()); getModelConsumer().setInheritingHiddensConsumer(getInheritingHiddensConsumer()); getModelConsumer().setOverridingHiddensConsumer(getOverridingHiddensConsumer()); getModelConsumer().setWithHiddensConsumer(getWithHiddensConsumer()); @@ -92,34 +103,39 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars getInheritingHiddensConsumer().setHidingHiddensConsumer(getHidingHiddensConsumer()); getInheritingHiddensConsumer().setInheritingHiddensCallConsumer(getInheritingHiddensCallConsumer()); + getDatatypeHiddensConsumer().setDatatypeRuleConsumer(getDatatypeRuleConsumer()); + getHidingHiddensConsumer().setInheritingHiddensCallConsumer(getInheritingHiddensCallConsumer()); getHidingHiddensConsumer().setWsConsumer(getWsConsumer()); - getWithoutHiddensConsumer().setKeyword$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getWithoutHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getWithoutHiddensConsumer().setKeyword$12$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getWithoutHiddensConsumer().setRuleCall$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$19$Delimiter); - getWithoutHiddensConsumer().setRuleCall$10$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$19$Delimiter); - getWithHiddensConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getWithHiddensConsumer().setKeyword$4$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getWithHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensConsumer().setKeyword$11$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensConsumer().setKeyword$13$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensCallConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensCallConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getOverridingHiddensCallConsumer().setRuleCall$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$19$Delimiter); - getInheritingHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getInheritingHiddensConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getInheritingHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getInheritingHiddensConsumer().setKeyword$14$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getInheritingHiddensConsumer().setKeyword$16$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getHidingHiddensConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getHidingHiddensConsumer().setRuleCall$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$19$Delimiter); - getInheritingHiddensCallConsumer().setKeyword$2$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); - getInheritingHiddensCallConsumer().setKeyword$4$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$17$Delimiter); + getWithoutHiddensConsumer().setKeyword$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getWithoutHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getWithoutHiddensConsumer().setKeyword$12$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getWithoutHiddensConsumer().setRuleCall$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$21$Delimiter); + getWithoutHiddensConsumer().setRuleCall$10$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$21$Delimiter); + getWithHiddensConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getWithHiddensConsumer().setKeyword$4$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getWithHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensConsumer().setKeyword$11$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensConsumer().setKeyword$13$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensCallConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensCallConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getOverridingHiddensCallConsumer().setRuleCall$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$21$Delimiter); + getInheritingHiddensConsumer().setKeyword$6$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getInheritingHiddensConsumer().setKeyword$7$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getInheritingHiddensConsumer().setKeyword$8$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getInheritingHiddensConsumer().setKeyword$14$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getInheritingHiddensConsumer().setKeyword$16$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getDatatypeHiddensConsumer().setKeyword$2$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getDatatypeRuleConsumer().setKeyword$2$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getDatatypeRuleConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getHidingHiddensConsumer().setKeyword$3$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getHidingHiddensConsumer().setRuleCall$5$Delimiter(HiddenTerminalsTestLanguageDelimiters.ruleCall$21$Delimiter); + getInheritingHiddensCallConsumer().setKeyword$2$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); + getInheritingHiddensCallConsumer().setKeyword$4$Delimiter(HiddenTerminalsTestLanguageDelimiters.keyword$19$Delimiter); } public HiddenTerminalsTestLanguageModelConsumer getModelConsumer() { @@ -146,6 +162,14 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars return inheritingHiddensConsumer; } + public HiddenTerminalsTestLanguageDatatypeHiddensConsumer getDatatypeHiddensConsumer() { + return datatypeHiddensConsumer; + } + + public HiddenTerminalsTestLanguageDatatypeRuleConsumer getDatatypeRuleConsumer() { + return datatypeRuleConsumer; + } + public HiddenTerminalsTestLanguageHidingHiddensConsumer getHidingHiddensConsumer() { return hidingHiddensConsumer; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeHiddensConsumer.java new file mode 100644 index 0000000..a326be5 --- a/dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeHiddensConsumer.java @@ -0,0 +1,110 @@ +/* +Generated with Xtext +*/ +package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; +import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; +import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration; +import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; +import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; +import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher; + +import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; +import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.DatatypeHiddensElements; + +import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageDatatypeRuleConsumer; + +@SuppressWarnings("unused") +public final class HiddenTerminalsTestLanguageDatatypeHiddensConsumer extends NonTerminalConsumer { + + private HiddenTerminalsTestLanguageDatatypeRuleConsumer datatypeRuleConsumer; + + private ICharacterClass keyword$2$Delimiter; + + public HiddenTerminalsTestLanguageDatatypeHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); + keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); + } + + protected int doConsume(int entryPoint) throws Exception { + return consumeGroup$1(entryPoint); + } + + protected int consumeGroup$1(int entryPoint) throws Exception { + announceNextLevel(); + final IMarker marker = mark(); + int result = ConsumeResult.SUCCESS; + switch(entryPoint) { + case -1: // use fall through semantics of switch case + result = ConsumeResult.EMPTY_MATCH; + case 0: + announceNextStep(); + result = consumeKeyword$2(nextEntryPoint()); + if (result!=ConsumeResult.SUCCESS) { + error("Another token expected.", getRule().ele0KeywordDatatype()); + marker.commit(); + announceLevelFinished(); + return result; + } + case 1: + announceNextStep(); + result = consumeAssignment$3(nextEntryPoint()); + if (result!=ConsumeResult.SUCCESS) { + error("Another token expected.", getRule().ele1AssignmentValid()); + marker.commit(); + announceLevelFinished(); + return result; + } + } + marker.commit(); + announceLevelFinished(); + return result; + } + + protected int consumeKeyword$2(int entryPoint) throws Exception { + return consumeKeyword(getRule().ele0KeywordDatatype(), null, false, false, getKeyword$2$Delimiter()); + } + + protected int consumeAssignment$3(int entryPoint) throws Exception { + int result = ConsumeResult.EMPTY_MATCH; + int tempResult; + announceNextLevel(); + tempResult = consumeNonTerminal(datatypeRuleConsumer, "valid", false, true, true, getRule().ele10ParserRuleCallDatatypeRule()); + if (tempResult == ConsumeResult.SUCCESS) { + announceLevelFinished(); + return tempResult; + } + result = tempResult >= result ? tempResult : result; + announceLevelFinished(); + return result; + } + + public DatatypeHiddensElements getRule() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeHiddens(); + } + + protected EObject getGrammarElement() { + return getRule().getRule(); + } + + @Override + protected String getDefaultTypeName() { + return "DatatypeHiddens"; + } + + public void setDatatypeRuleConsumer(HiddenTerminalsTestLanguageDatatypeRuleConsumer datatypeRuleConsumer) { + this.datatypeRuleConsumer = datatypeRuleConsumer; + } + + public ICharacterClass getKeyword$2$Delimiter() { + return keyword$2$Delimiter; + } + + public void setKeyword$2$Delimiter(ICharacterClass characterClass) { + keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + +} diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeRuleConsumer.java new file mode 100644 index 0000000..957a3a1 --- a/dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageDatatypeRuleConsumer.java @@ -0,0 +1,105 @@ +/* +Generated with Xtext +*/ +package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; +import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer; +import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration; +import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; +import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; +import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher; + +import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; +import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.DatatypeRuleElements; + + +@SuppressWarnings("unused") +public final class HiddenTerminalsTestLanguageDatatypeRuleConsumer extends NonTerminalConsumer { + + + private ICharacterClass keyword$2$Delimiter; + + private ICharacterClass keyword$3$Delimiter; + + public HiddenTerminalsTestLanguageDatatypeRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); + keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); + } + + protected int doConsume(int entryPoint) throws Exception { + return consumeGroup$1(entryPoint); + } + + protected int consumeGroup$1(int entryPoint) throws Exception { + announceNextLevel(); + final IMarker marker = mark(); + int result = ConsumeResult.SUCCESS; + switch(entryPoint) { + case -1: // use fall through semantics of switch case + result = ConsumeResult.EMPTY_MATCH; + case 0: + announceNextStep(); + result = consumeKeyword$2(nextEntryPoint()); + if (result!=ConsumeResult.SUCCESS) { + error("Another token expected.", getRule().ele0KeywordRule()); + marker.commit(); + announceLevelFinished(); + return result; + } + case 1: + announceNextStep(); + result = consumeKeyword$3(nextEntryPoint()); + if (result!=ConsumeResult.SUCCESS) { + error("Another token expected.", getRule().ele1KeywordSemicolon()); + marker.commit(); + announceLevelFinished(); + return result; + } + } + marker.commit(); + announceLevelFinished(); + return result; + } + + protected int consumeKeyword$2(int entryPoint) throws Exception { + return consumeKeyword(getRule().ele0KeywordRule(), null, false, false, getKeyword$2$Delimiter()); + } + + protected int consumeKeyword$3(int entryPoint) throws Exception { + return consumeKeyword(getRule().ele1KeywordSemicolon(), null, false, false, getKeyword$3$Delimiter()); + } + + public DatatypeRuleElements getRule() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeRule(); + } + + protected EObject getGrammarElement() { + return getRule().getRule(); + } + + @Override + protected String getDefaultTypeName() { + return "EString"; + } + + public ICharacterClass getKeyword$2$Delimiter() { + return keyword$2$Delimiter; + } + + public void setKeyword$2$Delimiter(ICharacterClass characterClass) { + keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + + public ICharacterClass getKeyword$3$Delimiter() { + return keyword$3$Delimiter; + } + + public void setKeyword$3$Delimiter(ICharacterClass characterClass) { + keyword$3$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + +} diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java index a2f44b4..add5c9c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java @@ -100,7 +100,7 @@ public final class HiddenTerminalsTestLanguageHidingHiddensConsumer extends NonT int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(inheritingHiddensCallConsumer, "called", false, false, getRule().ele10ParserRuleCallInheritingHiddensCall()); + tempResult = consumeNonTerminal(inheritingHiddensCallConsumer, "called", false, false, false, getRule().ele10ParserRuleCallInheritingHiddensCall()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java index d6e21a1..ec85676 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java @@ -149,7 +149,7 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensConsumer extends int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(inheritingHiddensCallConsumer, "called", false, false, getRule().ele00100ParserRuleCallInheritingHiddensCall()); + tempResult = consumeNonTerminal(inheritingHiddensCallConsumer, "called", false, false, false, getRule().ele00100ParserRuleCallInheritingHiddensCall()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -163,7 +163,7 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensConsumer extends int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(hidingHiddensConsumer, "hidingCalled", false, false, getRule().ele00110ParserRuleCallHidingHiddens()); + tempResult = consumeNonTerminal(hidingHiddensConsumer, "hidingCalled", false, false, false, getRule().ele00110ParserRuleCallHidingHiddens()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java index f5c282d..f5ee56b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java @@ -15,6 +15,7 @@ import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.ModelElements; +import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageDatatypeHiddensConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageInheritingHiddensConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageOverridingHiddensConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageWithHiddensConsumer; @@ -23,6 +24,7 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTer @SuppressWarnings("unused") public final class HiddenTerminalsTestLanguageModelConsumer extends NonTerminalConsumer { + private HiddenTerminalsTestLanguageDatatypeHiddensConsumer datatypeHiddensConsumer; private HiddenTerminalsTestLanguageInheritingHiddensConsumer inheritingHiddensConsumer; private HiddenTerminalsTestLanguageOverridingHiddensConsumer overridingHiddensConsumer; private HiddenTerminalsTestLanguageWithHiddensConsumer withHiddensConsumer; @@ -43,42 +45,51 @@ public final class HiddenTerminalsTestLanguageModelConsumer extends NonTerminalC result.reset(); case 0: result.nextAlternative(); - if (result.isAlternativeDone(consumeRuleCall$4(nextEntryPoint()))) { + if (result.isAlternativeDone(consumeRuleCall$5(nextEntryPoint()))) { return result.getResult(); } case 1: result.nextAlternative(); - if (result.isAlternativeDone(consumeRuleCall$5(nextEntryPoint()))) { + if (result.isAlternativeDone(consumeRuleCall$6(nextEntryPoint()))) { return result.getResult(); } case 2: result.nextAlternative(); - if (result.isAlternativeDone(consumeRuleCall$6(nextEntryPoint()))) { + if (result.isAlternativeDone(consumeRuleCall$7(nextEntryPoint()))) { return result.getResult(); } case 3: result.nextAlternative(); - if (result.isAlternativeDone(consumeRuleCall$7(nextEntryPoint()))) { + if (result.isAlternativeDone(consumeRuleCall$8(nextEntryPoint()))) { + return result.getResult(); + } + case 4: + result.nextAlternative(); + if (result.isAlternativeDone(consumeRuleCall$9(nextEntryPoint()))) { return result.getResult(); } } return result.getResult(); } - protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(withoutHiddensConsumer, null, false, false, getRule().ele000ParserRuleCallWithoutHiddens()); - } - protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(withHiddensConsumer, null, false, false, getRule().ele001ParserRuleCallWithHiddens()); + return consumeNonTerminal(withoutHiddensConsumer, null, false, false, false, getRule().ele0000ParserRuleCallWithoutHiddens()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(overridingHiddensConsumer, null, false, false, getRule().ele01ParserRuleCallOverridingHiddens()); + return consumeNonTerminal(withHiddensConsumer, null, false, false, false, getRule().ele0001ParserRuleCallWithHiddens()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(inheritingHiddensConsumer, null, false, false, getRule().ele1ParserRuleCallInheritingHiddens()); + return consumeNonTerminal(overridingHiddensConsumer, null, false, false, false, getRule().ele001ParserRuleCallOverridingHiddens()); + } + + protected int consumeRuleCall$8(int entryPoint) throws Exception { + return consumeNonTerminal(inheritingHiddensConsumer, null, false, false, false, getRule().ele01ParserRuleCallInheritingHiddens()); + } + + protected int consumeRuleCall$9(int entryPoint) throws Exception { + return consumeNonTerminal(datatypeHiddensConsumer, null, false, false, false, getRule().ele1ParserRuleCallDatatypeHiddens()); } public ModelElements getRule() { @@ -94,6 +105,10 @@ public final class HiddenTerminalsTestLanguageModelConsumer extends NonTerminalC return "Model"; } + public void setDatatypeHiddensConsumer(HiddenTerminalsTestLanguageDatatypeHiddensConsumer datatypeHiddensConsumer) { + this.datatypeHiddensConsumer = datatypeHiddensConsumer; + } + public void setInheritingHiddensConsumer(HiddenTerminalsTestLanguageInheritingHiddensConsumer inheritingHiddensConsumer) { this.inheritingHiddensConsumer = inheritingHiddensConsumer; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java index a07a0f6..aaf1f61 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java @@ -128,7 +128,7 @@ public final class HiddenTerminalsTestLanguageOverridingHiddensConsumer extends int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(overridingHiddensCallConsumer, "called", false, false, getRule().ele0010ParserRuleCallOverridingHiddensCall()); + tempResult = consumeNonTerminal(overridingHiddensCallConsumer, "called", false, false, false, getRule().ele0010ParserRuleCallOverridingHiddensCall()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java index 1e35391..ef3ba41 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java @@ -52,11 +52,11 @@ public final class XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsume } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(generatedMetamodelConsumer, null, false, false, getRule().ele0ParserRuleCallGeneratedMetamodel()); + return consumeNonTerminal(generatedMetamodelConsumer, null, false, false, false, getRule().ele0ParserRuleCallGeneratedMetamodel()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(referencedMetamodelConsumer, null, false, false, getRule().ele1ParserRuleCallReferencedMetamodel()); + return consumeNonTerminal(referencedMetamodelConsumer, null, false, false, false, getRule().ele1ParserRuleCallReferencedMetamodel()); } public AbstractMetamodelDeclarationElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java index 4f124b8..07eb153 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java @@ -52,11 +52,11 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(negatedTokenConsumer, null, false, false, getRule().ele0ParserRuleCallNegatedToken()); + return consumeNonTerminal(negatedTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallNegatedToken()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(upToTokenConsumer, null, false, false, getRule().ele1ParserRuleCallUpToToken()); + return consumeNonTerminal(upToTokenConsumer, null, false, false, false, getRule().ele1ParserRuleCallUpToToken()); } public AbstractNegatedTokenElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java index af2e7b3..c5505d1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java @@ -59,15 +59,15 @@ public final class XtextTerminalsTestLanguageAbstractRuleConsumer extends NonTer } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(lexerRuleConsumer, null, false, false, getRule().ele00ParserRuleCallLexerRule()); + return consumeNonTerminal(lexerRuleConsumer, null, false, false, false, getRule().ele00ParserRuleCallLexerRule()); } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(parserRuleConsumer, null, false, false, getRule().ele01ParserRuleCallParserRule()); + return consumeNonTerminal(parserRuleConsumer, null, false, false, false, getRule().ele01ParserRuleCallParserRule()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(terminalRuleConsumer, null, false, false, getRule().ele1ParserRuleCallTerminalRule()); + return consumeNonTerminal(terminalRuleConsumer, null, false, false, false, getRule().ele1ParserRuleCallTerminalRule()); } public AbstractRuleElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java index 68d5268..1f26172 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java @@ -66,19 +66,19 @@ public final class XtextTerminalsTestLanguageAbstractTerminalConsumer extends No } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(keywordConsumer, null, false, false, getRule().ele000ParserRuleCallKeyword()); + return consumeNonTerminal(keywordConsumer, null, false, false, false, getRule().ele000ParserRuleCallKeyword()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(ruleCallConsumer, null, false, false, getRule().ele001ParserRuleCallRuleCall()); + return consumeNonTerminal(ruleCallConsumer, null, false, false, false, getRule().ele001ParserRuleCallRuleCall()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(parenthesizedElementConsumer, null, false, false, getRule().ele01ParserRuleCallParenthesizedElement()); + return consumeNonTerminal(parenthesizedElementConsumer, null, false, false, false, getRule().ele01ParserRuleCallParenthesizedElement()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(crossReferenceConsumer, null, false, false, getRule().ele1ParserRuleCallCrossReference()); + return consumeNonTerminal(crossReferenceConsumer, null, false, false, false, getRule().ele1ParserRuleCallCrossReference()); } public AbstractTerminalElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java index 471e605..c23dd02 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java @@ -99,15 +99,15 @@ public final class XtextTerminalsTestLanguageAbstractTokenConsumer extends NonTe } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(assignmentConsumer, null, false, false, getRule().ele000ParserRuleCallAssignment()); + return consumeNonTerminal(assignmentConsumer, null, false, false, false, getRule().ele000ParserRuleCallAssignment()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(actionConsumer, null, false, false, getRule().ele001ParserRuleCallAction()); + return consumeNonTerminal(actionConsumer, null, false, false, false, getRule().ele001ParserRuleCallAction()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(abstractTerminalConsumer, null, false, false, getRule().ele01ParserRuleCallAbstractTerminal()); + return consumeNonTerminal(abstractTerminalConsumer, null, false, false, false, getRule().ele01ParserRuleCallAbstractTerminal()); } protected int consumeAssignment$7(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java index 3509532..6ee126a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java @@ -201,7 +201,7 @@ public final class XtextTerminalsTestLanguageActionConsumer extends NonTerminalC int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "typeName", false, false, getRule().ele0000010ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "typeName", false, false, false, getRule().ele0000010ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java index 70667c9..e6c4314 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java @@ -65,7 +65,7 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(groupConsumer, null, false, false, getRule().ele0ParserRuleCallGroup()); + return consumeNonTerminal(groupConsumer, null, false, false, false, getRule().ele0ParserRuleCallGroup()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -129,7 +129,7 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(groupConsumer, "groups", true, false, getRule().ele110ParserRuleCallGroup()); + tempResult = consumeNonTerminal(groupConsumer, "groups", true, false, false, getRule().ele110ParserRuleCallGroup()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java index 6a594f3..7a06bd7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java @@ -138,7 +138,7 @@ public final class XtextTerminalsTestLanguageAssignmentConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractTerminalConsumer, "terminal", false, false, getRule().ele10ParserRuleCallAbstractTerminal()); + tempResult = consumeNonTerminal(abstractTerminalConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallAbstractTerminal()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java index c8aee84..15272e9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java @@ -65,7 +65,7 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(keywordConsumer, null, false, false, getRule().ele0ParserRuleCallKeyword()); + return consumeNonTerminal(keywordConsumer, null, false, false, false, getRule().ele0ParserRuleCallKeyword()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -130,7 +130,7 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(keywordConsumer, "right", false, false, getRule().ele110ParserRuleCallKeyword()); + tempResult = consumeNonTerminal(keywordConsumer, "right", false, false, false, getRule().ele110ParserRuleCallKeyword()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 0f86a65..e9ac40b 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 @@ -101,7 +101,7 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele0010ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele0010ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java index acbcc97..ddf0aa5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java @@ -376,7 +376,7 @@ public final class XtextTerminalsTestLanguageGrammarConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractMetamodelDeclarationConsumer, "metamodelDeclarations", true, false, getRule().ele010ParserRuleCallAbstractMetamodelDeclaration()); + tempResult = consumeNonTerminal(abstractMetamodelDeclarationConsumer, "metamodelDeclarations", true, false, false, getRule().ele010ParserRuleCallAbstractMetamodelDeclaration()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -419,7 +419,7 @@ public final class XtextTerminalsTestLanguageGrammarConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, getRule().ele10ParserRuleCallAbstractRule()); + tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, false, getRule().ele10ParserRuleCallAbstractRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java index 89ab606..724953f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java @@ -62,7 +62,7 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(abstractTokenConsumer, null, false, false, getRule().ele0ParserRuleCallAbstractToken()); + return consumeNonTerminal(abstractTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallAbstractToken()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractTokenConsumer, "abstractTokens", true, false, getRule().ele110ParserRuleCallAbstractToken()); + tempResult = consumeNonTerminal(abstractTokenConsumer, "abstractTokens", true, false, false, getRule().ele110ParserRuleCallAbstractToken()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java index 46dd6b6..af1af88 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java @@ -212,7 +212,7 @@ public final class XtextTerminalsTestLanguageLexerRuleConsumer extends NonTermin int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java index f623a3b..0e66327 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java @@ -72,7 +72,7 @@ public final class XtextTerminalsTestLanguageNegatedTokenConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); + tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java index de6f112..1b2dc01 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java @@ -81,7 +81,7 @@ public final class XtextTerminalsTestLanguageParenthesizedElementConsumer extend } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(alternativesConsumer, null, false, false, getRule().ele01ParserRuleCallAlternatives()); + return consumeNonTerminal(alternativesConsumer, null, false, false, false, getRule().ele01ParserRuleCallAlternatives()); } protected int consumeKeyword$5(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java index acb0b22..0ac2574 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java @@ -81,7 +81,7 @@ public final class XtextTerminalsTestLanguageParenthesizedTerminalElementConsume } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(terminalAlternativesConsumer, null, false, false, getRule().ele01ParserRuleCallTerminalAlternatives()); + return consumeNonTerminal(terminalAlternativesConsumer, null, false, false, false, getRule().ele01ParserRuleCallTerminalAlternatives()); } protected int consumeKeyword$5(int entryPoint) throws Exception { 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 f886f4d..a4575bb 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 @@ -194,7 +194,7 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele0000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele0000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -406,7 +406,7 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(alternativesConsumer, "alternatives", false, false, getRule().ele010ParserRuleCallAlternatives()); + tempResult = consumeNonTerminal(alternativesConsumer, "alternatives", false, false, false, getRule().ele010ParserRuleCallAlternatives()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java index 9a56c3f..3a0512d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java @@ -65,7 +65,7 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalGroupConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalGroup()); + return consumeNonTerminal(terminalGroupConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalGroup()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -129,7 +129,7 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalGroupConsumer, "groups", true, false, getRule().ele110ParserRuleCallTerminalGroup()); + tempResult = consumeNonTerminal(terminalGroupConsumer, "groups", true, false, false, getRule().ele110ParserRuleCallTerminalGroup()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java index b9cebf8..33f161e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java @@ -62,7 +62,7 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalTokenConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalToken()); + return consumeNonTerminal(terminalTokenConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalToken()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenConsumer, "abstractTokens", true, false, getRule().ele110ParserRuleCallTerminalToken()); + tempResult = consumeNonTerminal(terminalTokenConsumer, "abstractTokens", true, false, false, getRule().ele110ParserRuleCallTerminalToken()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java index 2b6ca88..e8709fe 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java @@ -193,7 +193,7 @@ public final class XtextTerminalsTestLanguageTerminalRuleConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, getRule().ele000110ParserRuleCallTypeRef()); + tempResult = consumeNonTerminal(typeRefConsumer, "type", false, false, false, getRule().ele000110ParserRuleCallTypeRef()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -211,7 +211,7 @@ public final class XtextTerminalsTestLanguageTerminalRuleConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalAlternativesConsumer, "alternatives", false, false, getRule().ele010ParserRuleCallTerminalAlternatives()); + tempResult = consumeNonTerminal(terminalAlternativesConsumer, "alternatives", false, false, false, getRule().ele010ParserRuleCallTerminalAlternatives()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java index 8bf542f..4538c6b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java @@ -71,7 +71,7 @@ public final class XtextTerminalsTestLanguageTerminalTokenConsumer extends NonTe } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(terminalTokenElementConsumer, null, false, false, getRule().ele0ParserRuleCallTerminalTokenElement()); + return consumeNonTerminal(terminalTokenElementConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerminalTokenElement()); } protected int consumeAssignment$3(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java index 62d6ec2..6ac1f7e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java @@ -73,23 +73,23 @@ public final class XtextTerminalsTestLanguageTerminalTokenElementConsumer extend } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(characterRangeConsumer, null, false, false, getRule().ele0000ParserRuleCallCharacterRange()); + return consumeNonTerminal(characterRangeConsumer, null, false, false, false, getRule().ele0000ParserRuleCallCharacterRange()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(ruleCallConsumer, null, false, false, getRule().ele0001ParserRuleCallRuleCall()); + return consumeNonTerminal(ruleCallConsumer, null, false, false, false, getRule().ele0001ParserRuleCallRuleCall()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(parenthesizedTerminalElementConsumer, null, false, false, getRule().ele001ParserRuleCallParenthesizedTerminalElement()); + return consumeNonTerminal(parenthesizedTerminalElementConsumer, null, false, false, false, getRule().ele001ParserRuleCallParenthesizedTerminalElement()); } protected int consumeRuleCall$8(int entryPoint) throws Exception { - return consumeNonTerminal(abstractNegatedTokenConsumer, null, false, false, getRule().ele01ParserRuleCallAbstractNegatedToken()); + return consumeNonTerminal(abstractNegatedTokenConsumer, null, false, false, false, getRule().ele01ParserRuleCallAbstractNegatedToken()); } protected int consumeRuleCall$9(int entryPoint) throws Exception { - return consumeNonTerminal(wildcardConsumer, null, false, false, getRule().ele1ParserRuleCallWildcard()); + return consumeNonTerminal(wildcardConsumer, null, false, false, false, getRule().ele1ParserRuleCallWildcard()); } public TerminalTokenElementElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java index d4124da..f2c74b9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java @@ -72,7 +72,7 @@ public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTermin int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); + tempResult = consumeNonTerminal(terminalTokenElementConsumer, "terminal", false, false, false, getRule().ele10ParserRuleCallTerminalTokenElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parsetree/reconstr/HiddenTerminalsTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parsetree/reconstr/HiddenTerminalsTestLanguageParseTreeConstructor.java index 91490a3..45ebda9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parsetree/reconstr/HiddenTerminalsTestLanguageParseTreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parsetree/reconstr/HiddenTerminalsTestLanguageParseTreeConstructor.java @@ -23,6 +23,7 @@ public class HiddenTerminalsTestLanguageParseTreeConstructor extends AbstractPar if(inst.isInstanceOf("OverridingHiddens") && (s = new OverridingHiddens_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf("OverridingHiddensCall") && (s = new OverridingHiddensCall_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf("InheritingHiddens") && (s = new InheritingHiddens_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; + if(inst.isInstanceOf("DatatypeHiddens") && (s = new DatatypeHiddens_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf("HidingHiddens") && (s = new HidingHiddens_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; if(inst.isInstanceOf("InheritingHiddensCall") && (s = new InheritingHiddensCall_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s; return null; @@ -31,12 +32,12 @@ public class HiddenTerminalsTestLanguageParseTreeConstructor extends AbstractPar /************ begin Rule Model **************** * - * Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens ; + * Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens ; * **/ -// WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens +// WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens protected class Model_Alternatives extends AlternativesToken { public Model_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -48,7 +49,7 @@ protected class Model_Alternatives extends AlternativesToken { } protected Solution createSolution() { - AbstractToken t = (first) ? new Model_1_RuleCall_InheritingHiddens(current, this) : new Model_0_Alternatives(current, this); + AbstractToken t = (first) ? new Model_1_RuleCall_DatatypeHiddens(current, this) : new Model_0_Alternatives(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -57,7 +58,7 @@ protected class Model_Alternatives extends AlternativesToken { } } -// WithoutHiddens | WithHiddens | OverridingHiddens +// WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens protected class Model_0_Alternatives extends AlternativesToken { public Model_0_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -69,7 +70,7 @@ protected class Model_0_Alternatives extends AlternativesToken { } protected Solution createSolution() { - AbstractToken t = (first) ? new Model_0_1_RuleCall_OverridingHiddens(current, this) : new Model_0_0_Alternatives(current, this); + AbstractToken t = (first) ? new Model_0_1_RuleCall_InheritingHiddens(current, this) : new Model_0_0_Alternatives(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -78,7 +79,7 @@ protected class Model_0_Alternatives extends AlternativesToken { } } -// WithoutHiddens | WithHiddens +// WithoutHiddens | WithHiddens | OverridingHiddens protected class Model_0_0_Alternatives extends AlternativesToken { public Model_0_0_Alternatives(IInstanceDescription curr, AbstractToken pred) { @@ -90,7 +91,28 @@ protected class Model_0_0_Alternatives extends AlternativesToken { } protected Solution createSolution() { - AbstractToken t = (first) ? new Model_0_0_1_RuleCall_WithHiddens(current, this) : new Model_0_0_0_RuleCall_WithoutHiddens(current, this); + AbstractToken t = (first) ? new Model_0_0_1_RuleCall_OverridingHiddens(current, this) : new Model_0_0_0_Alternatives(current, this); + Solution s = t.firstSolution(); + if(s == null && activateNextSolution()) s = createSolution(); + if(s == null) return null; + last = s.getPredecessor(); + return s; + } +} + +// WithoutHiddens | WithHiddens +protected class Model_0_0_0_Alternatives extends AlternativesToken { + + public Model_0_0_0_Alternatives(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Alternatives getGrammarElement() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele000Alternatives(); + } + + protected Solution createSolution() { + AbstractToken t = (first) ? new Model_0_0_0_1_RuleCall_WithHiddens(current, this) : new Model_0_0_0_0_RuleCall_WithoutHiddens(current, this); Solution s = t.firstSolution(); if(s == null && activateNextSolution()) s = createSolution(); if(s == null) return null; @@ -100,14 +122,14 @@ protected class Model_0_0_Alternatives extends AlternativesToken { } // WithoutHiddens -protected class Model_0_0_0_RuleCall_WithoutHiddens extends RuleCallToken { +protected class Model_0_0_0_0_RuleCall_WithoutHiddens extends RuleCallToken { - public Model_0_0_0_RuleCall_WithoutHiddens(IInstanceDescription curr, AbstractToken pred) { + public Model_0_0_0_0_RuleCall_WithoutHiddens(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public RuleCall getGrammarElement() { - return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele000ParserRuleCallWithoutHiddens(); + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele0000ParserRuleCallWithoutHiddens(); } protected Solution createSolution() { @@ -118,14 +140,14 @@ protected class Model_0_0_0_RuleCall_WithoutHiddens extends RuleCallToken { } // WithHiddens -protected class Model_0_0_1_RuleCall_WithHiddens extends RuleCallToken { +protected class Model_0_0_0_1_RuleCall_WithHiddens extends RuleCallToken { - public Model_0_0_1_RuleCall_WithHiddens(IInstanceDescription curr, AbstractToken pred) { + public Model_0_0_0_1_RuleCall_WithHiddens(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public RuleCall getGrammarElement() { - return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele001ParserRuleCallWithHiddens(); + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele0001ParserRuleCallWithHiddens(); } protected Solution createSolution() { @@ -137,14 +159,14 @@ protected class Model_0_0_1_RuleCall_WithHiddens extends RuleCallToken { // OverridingHiddens -protected class Model_0_1_RuleCall_OverridingHiddens extends RuleCallToken { +protected class Model_0_0_1_RuleCall_OverridingHiddens extends RuleCallToken { - public Model_0_1_RuleCall_OverridingHiddens(IInstanceDescription curr, AbstractToken pred) { + public Model_0_0_1_RuleCall_OverridingHiddens(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public RuleCall getGrammarElement() { - return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele01ParserRuleCallOverridingHiddens(); + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele001ParserRuleCallOverridingHiddens(); } protected Solution createSolution() { @@ -156,14 +178,14 @@ protected class Model_0_1_RuleCall_OverridingHiddens extends RuleCallToken { // InheritingHiddens -protected class Model_1_RuleCall_InheritingHiddens extends RuleCallToken { +protected class Model_0_1_RuleCall_InheritingHiddens extends RuleCallToken { - public Model_1_RuleCall_InheritingHiddens(IInstanceDescription curr, AbstractToken pred) { + public Model_0_1_RuleCall_InheritingHiddens(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public RuleCall getGrammarElement() { - return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele1ParserRuleCallInheritingHiddens(); + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele01ParserRuleCallInheritingHiddens(); } protected Solution createSolution() { @@ -174,6 +196,25 @@ protected class Model_1_RuleCall_InheritingHiddens extends RuleCallToken { } +// DatatypeHiddens +protected class Model_1_RuleCall_DatatypeHiddens extends RuleCallToken { + + public Model_1_RuleCall_DatatypeHiddens(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public RuleCall getGrammarElement() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prModel().ele1ParserRuleCallDatatypeHiddens(); + } + + protected Solution createSolution() { + if(checkForRecursion(DatatypeHiddens_Group.class, current)) return null; + if(!current.isInstanceOf("DatatypeHiddens")) return null; + return new DatatypeHiddens_Group(current, this).firstSolution(); + } +} + + /************ end Rule Model ****************/ @@ -1220,6 +1261,83 @@ protected class InheritingHiddens_1_Assignment_valid extends AssignmentToken { /************ end Rule InheritingHiddens ****************/ +/************ begin Rule DatatypeHiddens **************** + * + * DatatypeHiddens : "datatype" valid ?= DatatypeRule ; + * + **/ + + +// "datatype" valid ?= DatatypeRule +protected class DatatypeHiddens_Group extends GroupToken { + + public DatatypeHiddens_Group(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Group getGrammarElement() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeHiddens().eleGroup(); + } + + protected Solution createSolution() { + Solution s1 = new DatatypeHiddens_1_Assignment_valid(current, this).firstSolution(); + while(s1 != null) { + Solution s2 = new DatatypeHiddens_0_Keyword_datatype(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + if(s2 == null) { + s1 = s1.getPredecessor().nextSolution(this,s1); + if(s1 == null) return null; + } else { + last = s2.getPredecessor(); + return s2; + } + } + return null; + + } +} + +// "datatype" +protected class DatatypeHiddens_0_Keyword_datatype extends KeywordToken { + + public DatatypeHiddens_0_Keyword_datatype(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Keyword getGrammarElement() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeHiddens().ele0KeywordDatatype(); + } +} + +// valid ?= DatatypeRule +protected class DatatypeHiddens_1_Assignment_valid extends AssignmentToken { + + public DatatypeHiddens_1_Assignment_valid(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Assignment getGrammarElement() { + return HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeHiddens().ele1AssignmentValid(); + } + + protected Solution createSolution() { + if((value = current.getConsumable("valid",IS_REQUIRED)) == null) return null; + IInstanceDescription obj = current.cloneAndConsume("valid"); + + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule + type = AssignmentType.PRC; + element = HiddenTerminalsTestLanguageGrammarAccess.INSTANCE.prDatatypeHiddens().ele10ParserRuleCallDatatypeRule(); + return new Solution(obj); + } + + return null; + } +} + + +/************ end Rule DatatypeHiddens ****************/ + + + /************ begin Rule HidingHiddens **************** * * HidingHiddens hidden ( ) : "hiding" space = WS called = InheritingHiddensCall ; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java index 27abca5..5d7ad29 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java @@ -14,34 +14,42 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final Alternatives c0Alternatives = (Alternatives)cAlternatives.eContents().get(0); private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0); - private final RuleCall c000ParserRuleCallWithoutHiddens = (RuleCall)c00Alternatives.eContents().get(0); - private final RuleCall c001ParserRuleCallWithHiddens = (RuleCall)c00Alternatives.eContents().get(1); - private final RuleCall c01ParserRuleCallOverridingHiddens = (RuleCall)c0Alternatives.eContents().get(1); - private final RuleCall c1ParserRuleCallInheritingHiddens = (RuleCall)cAlternatives.eContents().get(1); + private final Alternatives c000Alternatives = (Alternatives)c00Alternatives.eContents().get(0); + private final RuleCall c0000ParserRuleCallWithoutHiddens = (RuleCall)c000Alternatives.eContents().get(0); + private final RuleCall c0001ParserRuleCallWithHiddens = (RuleCall)c000Alternatives.eContents().get(1); + private final RuleCall c001ParserRuleCallOverridingHiddens = (RuleCall)c00Alternatives.eContents().get(1); + private final RuleCall c01ParserRuleCallInheritingHiddens = (RuleCall)c0Alternatives.eContents().get(1); + private final RuleCall c1ParserRuleCallDatatypeHiddens = (RuleCall)cAlternatives.eContents().get(1); - // Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens ; + // Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens ; public ParserRule getRule() { return rule; } - // WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens + // WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens public Alternatives eleAlternatives() { return cAlternatives; } - // WithoutHiddens | WithHiddens | OverridingHiddens + // WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens public Alternatives ele0Alternatives() { return c0Alternatives; } - // WithoutHiddens | WithHiddens + // WithoutHiddens | WithHiddens | OverridingHiddens public Alternatives ele00Alternatives() { return c00Alternatives; } + // WithoutHiddens | WithHiddens + public Alternatives ele000Alternatives() { return c000Alternatives; } + // WithoutHiddens - public RuleCall ele000ParserRuleCallWithoutHiddens() { return c000ParserRuleCallWithoutHiddens; } + public RuleCall ele0000ParserRuleCallWithoutHiddens() { return c0000ParserRuleCallWithoutHiddens; } // WithHiddens - public RuleCall ele001ParserRuleCallWithHiddens() { return c001ParserRuleCallWithHiddens; } + public RuleCall ele0001ParserRuleCallWithHiddens() { return c0001ParserRuleCallWithHiddens; } // OverridingHiddens - public RuleCall ele01ParserRuleCallOverridingHiddens() { return c01ParserRuleCallOverridingHiddens; } + public RuleCall ele001ParserRuleCallOverridingHiddens() { return c001ParserRuleCallOverridingHiddens; } // InheritingHiddens - public RuleCall ele1ParserRuleCallInheritingHiddens() { return c1ParserRuleCallInheritingHiddens; } + public RuleCall ele01ParserRuleCallInheritingHiddens() { return c01ParserRuleCallInheritingHiddens; } + + // DatatypeHiddens + public RuleCall ele1ParserRuleCallDatatypeHiddens() { return c1ParserRuleCallDatatypeHiddens; } } public class WithoutHiddensElements implements IParserRuleAccess { @@ -295,9 +303,51 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess public Keyword ele10KeywordSemicolon() { return c10KeywordSemicolon; } } - public class HidingHiddensElements implements IParserRuleAccess { + public class DatatypeHiddensElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8); private final Group cGroup = (Group)rule.eContents().get(1); + private final Keyword c0KeywordDatatype = (Keyword)cGroup.eContents().get(0); + private final Assignment c1AssignmentValid = (Assignment)cGroup.eContents().get(1); + private final RuleCall c10ParserRuleCallDatatypeRule = (RuleCall)c1AssignmentValid.eContents().get(0); + + // DatatypeHiddens : "datatype" valid ?= DatatypeRule ; + public ParserRule getRule() { return rule; } + + // "datatype" valid ?= DatatypeRule + public Group eleGroup() { return cGroup; } + + // "datatype" + public Keyword ele0KeywordDatatype() { return c0KeywordDatatype; } + + // valid ?= DatatypeRule + public Assignment ele1AssignmentValid() { return c1AssignmentValid; } + + // DatatypeRule + public RuleCall ele10ParserRuleCallDatatypeRule() { return c10ParserRuleCallDatatypeRule; } + } + + public class DatatypeRuleElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Keyword c0KeywordRule = (Keyword)cGroup.eContents().get(0); + private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1); + + // DatatypeRule returns EString hidden ( WS ) : "rule" ";" ; + public ParserRule getRule() { return rule; } + + // "rule" ";" + public Group eleGroup() { return cGroup; } + + // "rule" + public Keyword ele0KeywordRule() { return c0KeywordRule; } + + // ";" + public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; } + } + + public class HidingHiddensElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(10); + private final Group cGroup = (Group)rule.eContents().get(1); private final Group c0Group = (Group)cGroup.eContents().get(0); private final Keyword c00KeywordHiding = (Keyword)c0Group.eContents().get(0); private final Assignment c01AssignmentSpace = (Assignment)c0Group.eContents().get(1); @@ -331,7 +381,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } public class InheritingHiddensCallElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9); + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(11); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordCall = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentValid = (Assignment)cGroup.eContents().get(1); @@ -354,7 +404,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } public class ML_COMMENTElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) getGrammar().eContents().get(10); + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(12); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordSolidusAsterisk = (Keyword)cGroup.eContents().get(0); private final UpToToken c1UpToToken = (UpToToken)cGroup.eContents().get(1); @@ -377,7 +427,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } public class SL_COMMENTElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) getGrammar().eContents().get(11); + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(13); private final Group cGroup = (Group)rule.eContents().get(1); private final Group c0Group = (Group)cGroup.eContents().get(0); private final Keyword c00KeywordSolidusSolidus = (Keyword)c0Group.eContents().get(0); @@ -424,7 +474,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } public class WSElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) getGrammar().eContents().get(12); + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(14); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final Alternatives c0Alternatives = (Alternatives)cAlternatives.eContents().get(0); private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0); @@ -459,7 +509,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } public class ANY_OTHERElements implements IParserRuleAccess { - private final ParserRule rule = (ParserRule) getGrammar().eContents().get(13); + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(15); private final Wildcard cWildcard = (Wildcard)rule.eContents().get(1); // terminal ANY_OTHER returns EString : . ; @@ -479,6 +529,8 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess private static OverridingHiddensElements pOverridingHiddens; private static OverridingHiddensCallElements pOverridingHiddensCall; private static InheritingHiddensElements pInheritingHiddens; + private static DatatypeHiddensElements pDatatypeHiddens; + private static DatatypeRuleElements pDatatypeRule; private static HidingHiddensElements pHidingHiddens; private static InheritingHiddensCallElements pInheritingHiddensCall; private static ML_COMMENTElements pML_COMMENT; @@ -501,7 +553,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess } - // Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens ; + // Model : WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens ; public ModelElements prModel() { return (pModel != null) ? pModel : (pModel = new ModelElements()); } @@ -531,6 +583,16 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends BaseEPackageAccess return (pInheritingHiddens != null) ? pInheritingHiddens : (pInheritingHiddens = new InheritingHiddensElements()); } + // DatatypeHiddens : "datatype" valid ?= DatatypeRule ; + public DatatypeHiddensElements prDatatypeHiddens() { + return (pDatatypeHiddens != null) ? pDatatypeHiddens : (pDatatypeHiddens = new DatatypeHiddensElements()); + } + + // DatatypeRule returns EString hidden ( WS ) : "rule" ";" ; + public DatatypeRuleElements prDatatypeRule() { + return (pDatatypeRule != null) ? pDatatypeRule : (pDatatypeRule = new DatatypeRuleElements()); + } + // HidingHiddens hidden ( ) : "hiding" space = WS called = InheritingHiddensCall ; public HidingHiddensElements prHidingHiddens() { return (pHidingHiddens != null) ? pHidingHiddens : (pHidingHiddens = new HidingHiddensElements()); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java index ed98998..d82847c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java @@ -90,11 +90,11 @@ public final class FormatterTestLanguageRootConsumer extends NonTerminalConsumer } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(testLinewrapConsumer, null, false, false, getRule().ele10ParserRuleCallTestLinewrap()); + return consumeNonTerminal(testLinewrapConsumer, null, false, false, false, getRule().ele10ParserRuleCallTestLinewrap()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(testIndentationConsumer, null, false, false, getRule().ele11ParserRuleCallTestIndentation()); + return consumeNonTerminal(testIndentationConsumer, null, false, false, false, getRule().ele11ParserRuleCallTestIndentation()); } public RootElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java index da656b1..36eca4a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java @@ -130,7 +130,7 @@ public final class FormatterTestLanguageTestIndentationConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(testIndentationConsumer, "sub", true, false, getRule().ele0100ParserRuleCallTestIndentation()); + tempResult = consumeNonTerminal(testIndentationConsumer, "sub", true, false, false, getRule().ele0100ParserRuleCallTestIndentation()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -144,7 +144,7 @@ public final class FormatterTestLanguageTestIndentationConsumer extends NonTermi int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(lineConsumer, "items", true, false, getRule().ele0110ParserRuleCallLine()); + tempResult = consumeNonTerminal(lineConsumer, "items", true, false, false, getRule().ele0110ParserRuleCallLine()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java index 86e5648..d43982b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java @@ -81,7 +81,7 @@ public final class FormatterTestLanguageTestLinewrapConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(lineConsumer, "items", true, false, getRule().ele10ParserRuleCallLine()); + tempResult = consumeNonTerminal(lineConsumer, "items", true, false, false, getRule().ele10ParserRuleCallLine()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java index 9ea1471..92b0edb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java @@ -68,7 +68,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(termConsumer, null, false, false, getRule().ele0ParserRuleCallTerm()); + return consumeNonTerminal(termConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerm()); } protected int consumeAlternatives$3(int entryPoint) throws Exception { @@ -151,7 +151,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(termConsumer, "addOperands", true, false, getRule().ele1010ParserRuleCallTerm()); + tempResult = consumeNonTerminal(termConsumer, "addOperands", true, false, false, getRule().ele1010ParserRuleCallTerm()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -213,7 +213,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(termConsumer, "minusOperands", true, false, getRule().ele1110ParserRuleCallTerm()); + tempResult = consumeNonTerminal(termConsumer, "minusOperands", true, false, false, getRule().ele1110ParserRuleCallTerm()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageParensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageParensConsumer.java index 6898dd6..25adb8e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageParensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageParensConsumer.java @@ -93,7 +93,7 @@ public final class ComplexReconstrTestLanguageParensConsumer extends NonTerminal } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(opConsumer, null, false, false, getRule().ele001ParserRuleCallOp()); + return consumeNonTerminal(opConsumer, null, false, false, false, getRule().ele001ParserRuleCallOp()); } protected int consumeKeyword$6(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageRootConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageRootConsumer.java index 32da742..26c5985 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageRootConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageRootConsumer.java @@ -52,11 +52,11 @@ public final class ComplexReconstrTestLanguageRootConsumer extends NonTerminalCo } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(opConsumer, null, false, false, getRule().ele0ParserRuleCallOp()); + return consumeNonTerminal(opConsumer, null, false, false, false, getRule().ele0ParserRuleCallOp()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(trickyGConsumer, null, false, false, getRule().ele1ParserRuleCallTrickyG()); + return consumeNonTerminal(trickyGConsumer, null, false, false, false, getRule().ele1ParserRuleCallTrickyG()); } public RootElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTermConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTermConsumer.java index 6efdd79..bb45f1c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTermConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTermConsumer.java @@ -52,11 +52,11 @@ public final class ComplexReconstrTestLanguageTermConsumer extends NonTerminalCo } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(atomConsumer, null, false, false, getRule().ele0ParserRuleCallAtom()); + return consumeNonTerminal(atomConsumer, null, false, false, false, getRule().ele0ParserRuleCallAtom()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(parensConsumer, null, false, false, getRule().ele1ParserRuleCallParens()); + return consumeNonTerminal(parensConsumer, null, false, false, false, getRule().ele1ParserRuleCallParens()); } public TermElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java index 2ec95b2..893ec82 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java @@ -112,7 +112,7 @@ public final class ComplexReconstrTestLanguageTrickyAConsumer extends NonTermina } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(trickyA1Consumer, null, false, false, getRule().ele0001ParserRuleCallTrickyA1()); + return consumeNonTerminal(trickyA1Consumer, null, false, false, false, getRule().ele0001ParserRuleCallTrickyA1()); } protected int consumeAssignment$7(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG1Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG1Consumer.java index 3f36d1b..b6c6436 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG1Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG1Consumer.java @@ -128,7 +128,7 @@ public final class ComplexReconstrTestLanguageTrickyG1Consumer extends NonTermin int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(trickyG2Consumer, "vals", true, false, getRule().ele0100ParserRuleCallTrickyG2()); + tempResult = consumeNonTerminal(trickyG2Consumer, "vals", true, false, false, getRule().ele0100ParserRuleCallTrickyG2()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -186,7 +186,7 @@ public final class ComplexReconstrTestLanguageTrickyG1Consumer extends NonTermin int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(trickyG2Consumer, "vals", true, false, getRule().ele01110ParserRuleCallTrickyG2()); + tempResult = consumeNonTerminal(trickyG2Consumer, "vals", true, false, false, getRule().ele01110ParserRuleCallTrickyG2()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG2Consumer.java index de442b1..af98601 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG2Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG2Consumer.java @@ -55,7 +55,7 @@ public final class ComplexReconstrTestLanguageTrickyG2Consumer extends NonTermin } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(trickyG1Consumer, null, false, false, getRule().ele0ParserRuleCallTrickyG1()); + return consumeNonTerminal(trickyG1Consumer, null, false, false, false, getRule().ele0ParserRuleCallTrickyG1()); } protected int consumeAssignment$3(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyGConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyGConsumer.java index 2088d6a..2530cb1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyGConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyGConsumer.java @@ -72,7 +72,7 @@ public final class ComplexReconstrTestLanguageTrickyGConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(trickyG1Consumer, "tree", false, false, getRule().ele10ParserRuleCallTrickyG1()); + tempResult = consumeNonTerminal(trickyG1Consumer, "tree", false, false, false, getRule().ele10ParserRuleCallTrickyG1()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java index 625255a..6b00e32 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java @@ -62,7 +62,7 @@ public final class SimpleReconstrTestLanguageOpConsumer extends NonTerminalConsu } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(termConsumer, null, false, false, getRule().ele0ParserRuleCallTerm()); + return consumeNonTerminal(termConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerm()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class SimpleReconstrTestLanguageOpConsumer extends NonTerminalConsu int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(termConsumer, "values", true, false, getRule().ele110ParserRuleCallTerm()); + tempResult = consumeNonTerminal(termConsumer, "values", true, false, false, getRule().ele110ParserRuleCallTerm()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageParensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageParensConsumer.java index fbdeda1..09c81b9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageParensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageParensConsumer.java @@ -93,7 +93,7 @@ public final class SimpleReconstrTestLanguageParensConsumer extends NonTerminalC } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(opConsumer, null, false, false, getRule().ele001ParserRuleCallOp()); + return consumeNonTerminal(opConsumer, null, false, false, false, getRule().ele001ParserRuleCallOp()); } protected int consumeKeyword$6(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTermConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTermConsumer.java index d9709d6..ac10f27 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTermConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTermConsumer.java @@ -94,35 +94,35 @@ public final class SimpleReconstrTestLanguageTermConsumer extends NonTerminalCon } protected int consumeRuleCall$8(int entryPoint) throws Exception { - return consumeNonTerminal(atomConsumer, null, false, false, getRule().ele0000000ParserRuleCallAtom()); + return consumeNonTerminal(atomConsumer, null, false, false, false, getRule().ele0000000ParserRuleCallAtom()); } protected int consumeRuleCall$9(int entryPoint) throws Exception { - return consumeNonTerminal(twoNumbersConsumer, null, false, false, getRule().ele0000001ParserRuleCallTwoNumbers()); + return consumeNonTerminal(twoNumbersConsumer, null, false, false, false, getRule().ele0000001ParserRuleCallTwoNumbers()); } protected int consumeRuleCall$10(int entryPoint) throws Exception { - return consumeNonTerminal(manyStringsConsumer, null, false, false, getRule().ele000001ParserRuleCallManyStrings()); + return consumeNonTerminal(manyStringsConsumer, null, false, false, false, getRule().ele000001ParserRuleCallManyStrings()); } protected int consumeRuleCall$11(int entryPoint) throws Exception { - return consumeNonTerminal(parensConsumer, null, false, false, getRule().ele00001ParserRuleCallParens()); + return consumeNonTerminal(parensConsumer, null, false, false, false, getRule().ele00001ParserRuleCallParens()); } protected int consumeRuleCall$12(int entryPoint) throws Exception { - return consumeNonTerminal(typeConsumer, null, false, false, getRule().ele0001ParserRuleCallType()); + return consumeNonTerminal(typeConsumer, null, false, false, false, getRule().ele0001ParserRuleCallType()); } protected int consumeRuleCall$13(int entryPoint) throws Exception { - return consumeNonTerminal(ref2Consumer, null, false, false, getRule().ele001ParserRuleCallRef2()); + return consumeNonTerminal(ref2Consumer, null, false, false, false, getRule().ele001ParserRuleCallRef2()); } protected int consumeRuleCall$14(int entryPoint) throws Exception { - return consumeNonTerminal(spareConsumer, null, false, false, getRule().ele01ParserRuleCallSpare()); + return consumeNonTerminal(spareConsumer, null, false, false, false, getRule().ele01ParserRuleCallSpare()); } protected int consumeRuleCall$15(int entryPoint) throws Exception { - return consumeNonTerminal(booleanConsumer, null, false, false, getRule().ele1ParserRuleCallBoolean()); + return consumeNonTerminal(booleanConsumer, null, false, false, false, getRule().ele1ParserRuleCallBoolean()); } public TermElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestRootConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestRootConsumer.java index e1eee93..ff7297a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestRootConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestRootConsumer.java @@ -97,15 +97,15 @@ public final class TransientValuesTestRootConsumer extends NonTerminalConsumer { } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(testRequiredConsumer, null, false, false, getRule().ele100ParserRuleCallTestRequired()); + return consumeNonTerminal(testRequiredConsumer, null, false, false, false, getRule().ele100ParserRuleCallTestRequired()); } protected int consumeRuleCall$6(int entryPoint) throws Exception { - return consumeNonTerminal(testOptionalConsumer, null, false, false, getRule().ele101ParserRuleCallTestOptional()); + return consumeNonTerminal(testOptionalConsumer, null, false, false, false, getRule().ele101ParserRuleCallTestOptional()); } protected int consumeRuleCall$7(int entryPoint) throws Exception { - return consumeNonTerminal(testListConsumer, null, false, false, getRule().ele11ParserRuleCallTestList()); + return consumeNonTerminal(testListConsumer, null, false, false, false, getRule().ele11ParserRuleCallTestList()); } public RootElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java index 12e046c..707e072 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java @@ -71,7 +71,7 @@ public final class ActionTestLanguageElementConsumer extends NonTerminalConsumer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(itemConsumer, null, false, false, getRule().ele0ParserRuleCallItem()); + return consumeNonTerminal(itemConsumer, null, false, false, false, getRule().ele0ParserRuleCallItem()); } protected int consumeAction$4(int entryPoint) { consumeAction(getRule().ele10ActionItemitems(), "Item", true); @@ -82,7 +82,7 @@ public final class ActionTestLanguageElementConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(itemConsumer, "items", true, false, getRule().ele110ParserRuleCallItem()); + tempResult = consumeNonTerminal(itemConsumer, "items", true, false, false, getRule().ele110ParserRuleCallItem()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java index 1689a8e..a4bb1cd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageModelConsumer.java @@ -43,7 +43,7 @@ public final class ActionTestLanguageModelConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(elementConsumer, "children", true, false, getRule().ele0ParserRuleCallElement()); + tempResult = consumeNonTerminal(elementConsumer, "children", true, false, false, getRule().ele0ParserRuleCallElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java index f7f2f44..dee2ac3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java @@ -52,11 +52,11 @@ public final class ContentAssistTestLanguageAbstractRuleConsumer extends NonTerm } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(firstAbstractRuleChildConsumer, null, false, false, getRule().ele0ParserRuleCallFirstAbstractRuleChild()); + return consumeNonTerminal(firstAbstractRuleChildConsumer, null, false, false, false, getRule().ele0ParserRuleCallFirstAbstractRuleChild()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(secondAbstractRuleChildConsumer, null, false, false, getRule().ele1ParserRuleCallSecondAbstractRuleChild()); + return consumeNonTerminal(secondAbstractRuleChildConsumer, null, false, false, false, getRule().ele1ParserRuleCallSecondAbstractRuleChild()); } public AbstractRuleElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java index e413a62..70d52ae 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java @@ -153,7 +153,7 @@ public final class ContentAssistTestLanguageFirstAbstractRuleChildConsumer exten int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleConsumer, "elements", true, false, getRule().ele0010ParserRuleCallAbstractRule()); + tempResult = consumeNonTerminal(abstractRuleConsumer, "elements", true, false, false, getRule().ele0010ParserRuleCallAbstractRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java index 641e3d1..ab2a094 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java @@ -128,7 +128,7 @@ public final class ContentAssistTestLanguageSecondAbstractRuleChildConsumer exte int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleCallConsumer, "rule", false, false, getRule().ele010ParserRuleCallAbstractRuleCall()); + tempResult = consumeNonTerminal(abstractRuleCallConsumer, "rule", false, false, false, getRule().ele010ParserRuleCallAbstractRuleCall()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java index 06b3269..9a186f6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java @@ -113,7 +113,7 @@ public final class ContentAssistTestLanguageStartConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, getRule().ele010ParserRuleCallAbstractRule()); + tempResult = consumeNonTerminal(abstractRuleConsumer, "rules", true, false, false, getRule().ele010ParserRuleCallAbstractRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 2bab59b..8895ecf 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 @@ -256,7 +256,7 @@ public final class FowlerDslTestLanguageStateConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(transitionConsumer, "transitions", true, false, getRule().ele010ParserRuleCallTransition()); + tempResult = consumeNonTerminal(transitionConsumer, "transitions", true, false, false, getRule().ele010ParserRuleCallTransition()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStatemachineConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStatemachineConsumer.java index 97c678d..5c3779b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStatemachineConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStatemachineConsumer.java @@ -139,7 +139,7 @@ public final class FowlerDslTestLanguageStatemachineConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(eventConsumer, "events", true, false, getRule().ele0000010ParserRuleCallEvent()); + tempResult = consumeNonTerminal(eventConsumer, "events", true, false, false, getRule().ele0000010ParserRuleCallEvent()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -170,7 +170,7 @@ public final class FowlerDslTestLanguageStatemachineConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(commandConsumer, "commands", true, false, getRule().ele0010ParserRuleCallCommand()); + tempResult = consumeNonTerminal(commandConsumer, "commands", true, false, false, getRule().ele0010ParserRuleCallCommand()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -197,7 +197,7 @@ public final class FowlerDslTestLanguageStatemachineConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(stateConsumer, "states", true, false, getRule().ele10ParserRuleCallState()); + tempResult = consumeNonTerminal(stateConsumer, "states", true, false, false, getRule().ele10ParserRuleCallState()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageModelConsumer.java index 87135aa..c53377b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageModelConsumer.java @@ -43,7 +43,7 @@ public final class LexerTestLanguageModelConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(elementConsumer, "children", true, false, getRule().ele0ParserRuleCallElement()); + tempResult = consumeNonTerminal(elementConsumer, "children", true, false, false, getRule().ele0ParserRuleCallElement()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageAltsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageAltsConsumer.java index f9587dd..c7fea42 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageAltsConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageAltsConsumer.java @@ -59,15 +59,15 @@ public final class LookaheadTestLanguageAltsConsumer extends NonTerminalConsumer } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(lookAhead0Consumer, null, false, false, getRule().ele00ParserRuleCallLookAhead0()); + return consumeNonTerminal(lookAhead0Consumer, null, false, false, false, getRule().ele00ParserRuleCallLookAhead0()); } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(lookAhead1Consumer, null, false, false, getRule().ele01ParserRuleCallLookAhead1()); + return consumeNonTerminal(lookAhead1Consumer, null, false, false, false, getRule().ele01ParserRuleCallLookAhead1()); } protected int consumeRuleCall$5(int entryPoint) throws Exception { - return consumeNonTerminal(lookAhead3Consumer, null, false, false, getRule().ele1ParserRuleCallLookAhead3()); + return consumeNonTerminal(lookAhead3Consumer, null, false, false, false, getRule().ele1ParserRuleCallLookAhead3()); } public AltsElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageEntryConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageEntryConsumer.java index 27994ba..1d985b7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageEntryConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageEntryConsumer.java @@ -43,7 +43,7 @@ public final class LookaheadTestLanguageEntryConsumer extends NonTerminalConsume int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(altsConsumer, "contents", true, false, getRule().ele0ParserRuleCallAlts()); + tempResult = consumeNonTerminal(altsConsumer, "contents", true, false, false, getRule().ele0ParserRuleCallAlts()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead1Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead1Consumer.java index 2da0efe..8722640 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead1Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead1Consumer.java @@ -96,7 +96,7 @@ public final class LookaheadTestLanguageLookAhead1Consumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(lookAhead2Consumer, "y", false, false, getRule().ele0010ParserRuleCallLookAhead2()); + tempResult = consumeNonTerminal(lookAhead2Consumer, "y", false, false, false, getRule().ele0010ParserRuleCallLookAhead2()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead3Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead3Consumer.java index ccd84e0..6e9bd65 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead3Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead3Consumer.java @@ -114,7 +114,7 @@ public final class LookaheadTestLanguageLookAhead3Consumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(lookAhead4Consumer, "z", false, false, getRule().ele10ParserRuleCallLookAhead4()); + tempResult = consumeNonTerminal(lookAhead4Consumer, "z", false, false, false, getRule().ele10ParserRuleCallLookAhead4()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageModelConsumer.java index d8ff518..030f5c6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageModelConsumer.java @@ -44,7 +44,7 @@ public final class OptionalEmptyTestLanguageModelConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(greetingConsumer, "child", false, false, getRule().ele0ParserRuleCallGreeting()); + tempResult = consumeNonTerminal(greetingConsumer, "child", false, false, false, getRule().ele0ParserRuleCallGreeting()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildConsumer.java index 1e0fe37..b8fd5e9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildConsumer.java @@ -52,11 +52,11 @@ public final class PartialParserTestLanguageAbstractChildConsumer extends NonTer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(firstConcreteConsumer, null, false, false, getRule().ele0ParserRuleCallFirstConcrete()); + return consumeNonTerminal(firstConcreteConsumer, null, false, false, false, getRule().ele0ParserRuleCallFirstConcrete()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(secondConcreteConsumer, null, false, false, getRule().ele1ParserRuleCallSecondConcrete()); + return consumeNonTerminal(secondConcreteConsumer, null, false, false, false, getRule().ele1ParserRuleCallSecondConcrete()); } public AbstractChildElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildrenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildrenConsumer.java index 631cd89..815a8bb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildrenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildrenConsumer.java @@ -129,7 +129,7 @@ public final class PartialParserTestLanguageAbstractChildrenConsumer extends Non int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractChildConsumer, "abstractChildren", true, false, getRule().ele010ParserRuleCallAbstractChild()); + tempResult = consumeNonTerminal(abstractChildConsumer, "abstractChildren", true, false, false, getRule().ele010ParserRuleCallAbstractChild()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildConsumer.java index 7240de6..eac4769 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildConsumer.java @@ -116,7 +116,7 @@ public final class PartialParserTestLanguageChildConsumer extends NonTerminalCon int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedConsumer, "value", false, false, getRule().ele010ParserRuleCallNamed()); + tempResult = consumeNonTerminal(namedConsumer, "value", false, false, false, getRule().ele010ParserRuleCallNamed()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildrenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildrenConsumer.java index 9f30dee..5432fbc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildrenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildrenConsumer.java @@ -112,7 +112,7 @@ public final class PartialParserTestLanguageChildrenConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(childConsumer, "children", true, false, getRule().ele0010ParserRuleCallChild()); + tempResult = consumeNonTerminal(childConsumer, "children", true, false, false, getRule().ele0010ParserRuleCallChild()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -170,7 +170,7 @@ public final class PartialParserTestLanguageChildrenConsumer extends NonTerminal int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(childConsumer, "children", true, false, getRule().ele0110ParserRuleCallChild()); + tempResult = consumeNonTerminal(childConsumer, "children", true, false, false, getRule().ele0110ParserRuleCallChild()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContainerConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContainerConsumer.java index a4f8b23..c1ecb5d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContainerConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContainerConsumer.java @@ -158,7 +158,7 @@ public final class PartialParserTestLanguageContainerConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nestedConsumer, "nested", true, false, getRule().ele0100ParserRuleCallNested()); + tempResult = consumeNonTerminal(nestedConsumer, "nested", true, false, false, getRule().ele0100ParserRuleCallNested()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -172,7 +172,7 @@ public final class PartialParserTestLanguageContainerConsumer extends NonTermina int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(contentConsumer, "content", true, false, getRule().ele0110ParserRuleCallContent()); + tempResult = consumeNonTerminal(contentConsumer, "content", true, false, false, getRule().ele0110ParserRuleCallContent()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContentConsumer.java index 1b0a558..4c0e431 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContentConsumer.java @@ -52,11 +52,11 @@ public final class PartialParserTestLanguageContentConsumer extends NonTerminalC } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(childrenConsumer, null, false, false, getRule().ele0ParserRuleCallChildren()); + return consumeNonTerminal(childrenConsumer, null, false, false, false, getRule().ele0ParserRuleCallChildren()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(abstractChildrenConsumer, null, false, false, getRule().ele1ParserRuleCallAbstractChildren()); + return consumeNonTerminal(abstractChildrenConsumer, null, false, false, false, getRule().ele1ParserRuleCallAbstractChildren()); } public ContentElements getRule() { 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 f64e5bd..e1a865a 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 @@ -130,7 +130,7 @@ public final class PartialParserTestLanguageFirstConcreteConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedConsumer, "value", false, false, getRule().ele0010ParserRuleCallNamed()); + tempResult = consumeNonTerminal(namedConsumer, "value", false, false, false, getRule().ele0010ParserRuleCallNamed()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNestedConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNestedConsumer.java index 6783c18..b277ee2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNestedConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNestedConsumer.java @@ -129,7 +129,7 @@ public final class PartialParserTestLanguageNestedConsumer extends NonTerminalCo int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(containerConsumer, "nested", true, false, getRule().ele010ParserRuleCallContainer()); + tempResult = consumeNonTerminal(containerConsumer, "nested", true, false, false, getRule().ele010ParserRuleCallContainer()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; 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 347c508..a930143 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 @@ -146,7 +146,7 @@ public final class PartialParserTestLanguageSecondConcreteConsumer extends NonTe int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(namedConsumer, "value", false, false, getRule().ele0010ParserRuleCallNamed()); + tempResult = consumeNonTerminal(namedConsumer, "value", false, false, false, getRule().ele0010ParserRuleCallNamed()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguagePersonConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguagePersonConsumer.java index 8310c7f..babfdbc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguagePersonConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguagePersonConsumer.java @@ -52,11 +52,11 @@ public final class ReferenceGrammarTestLanguagePersonConsumer extends NonTermina } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(kindConsumer, null, false, false, getRule().ele0ParserRuleCallKind()); + return consumeNonTerminal(kindConsumer, null, false, false, false, getRule().ele0ParserRuleCallKind()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(erwachsenerConsumer, null, false, false, getRule().ele1ParserRuleCallErwachsener()); + return consumeNonTerminal(erwachsenerConsumer, null, false, false, false, getRule().ele1ParserRuleCallErwachsener()); } public PersonElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java index a4f118c..f777734 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java @@ -220,7 +220,7 @@ public final class ReferenceGrammarTestLanguageSpielplatzConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(kindConsumer, "kinder", true, false, getRule().ele010000ParserRuleCallKind()); + tempResult = consumeNonTerminal(kindConsumer, "kinder", true, false, false, getRule().ele010000ParserRuleCallKind()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -234,7 +234,7 @@ public final class ReferenceGrammarTestLanguageSpielplatzConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(erwachsenerConsumer, "erzieher", true, false, getRule().ele010010ParserRuleCallErwachsener()); + tempResult = consumeNonTerminal(erwachsenerConsumer, "erzieher", true, false, false, getRule().ele010010ParserRuleCallErwachsener()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -248,7 +248,7 @@ public final class ReferenceGrammarTestLanguageSpielplatzConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(spielzeugConsumer, "spielzeuge", true, false, getRule().ele01010ParserRuleCallSpielzeug()); + tempResult = consumeNonTerminal(spielzeugConsumer, "spielzeuge", true, false, false, getRule().ele01010ParserRuleCallSpielzeug()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; @@ -262,7 +262,7 @@ public final class ReferenceGrammarTestLanguageSpielplatzConsumer extends NonTer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(familieConsumer, "familie", true, false, getRule().ele0110ParserRuleCallFamilie()); + tempResult = consumeNonTerminal(familieConsumer, "familie", true, false, false, getRule().ele0110ParserRuleCallFamilie()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java index 51b2ce6..6d6bc6a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java @@ -128,7 +128,7 @@ public final class ReferenceGrammarTestLanguageSpielzeugConsumer extends NonTerm int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(farbeConsumer, "farbe", false, false, getRule().ele010ParserRuleCallFarbe()); + tempResult = consumeNonTerminal(farbeConsumer, "farbe", false, false, false, getRule().ele010ParserRuleCallFarbe()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java index 8f49714..9f6a4b9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java @@ -68,7 +68,7 @@ public final class SimpleExpressionsTestLanguageAdditionConsumer extends NonTerm } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(multiplicationConsumer, null, false, false, getRule().ele0ParserRuleCallMultiplication()); + return consumeNonTerminal(multiplicationConsumer, null, false, false, false, getRule().ele0ParserRuleCallMultiplication()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -153,7 +153,7 @@ public final class SimpleExpressionsTestLanguageAdditionConsumer extends NonTerm int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(multiplicationConsumer, "values", true, false, getRule().ele110ParserRuleCallMultiplication()); + tempResult = consumeNonTerminal(multiplicationConsumer, "values", true, false, false, getRule().ele110ParserRuleCallMultiplication()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java index 415e2fc..8525835 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java @@ -68,7 +68,7 @@ public final class SimpleExpressionsTestLanguageMultiplicationConsumer extends N } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(termConsumer, null, false, false, getRule().ele0ParserRuleCallTerm()); + return consumeNonTerminal(termConsumer, null, false, false, false, getRule().ele0ParserRuleCallTerm()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -153,7 +153,7 @@ public final class SimpleExpressionsTestLanguageMultiplicationConsumer extends N int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(termConsumer, "values", true, false, getRule().ele110ParserRuleCallTerm()); + tempResult = consumeNonTerminal(termConsumer, "values", true, false, false, getRule().ele110ParserRuleCallTerm()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageParensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageParensConsumer.java index 87d77d2..e3987c0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageParensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageParensConsumer.java @@ -81,7 +81,7 @@ public final class SimpleExpressionsTestLanguageParensConsumer extends NonTermin } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(additionConsumer, null, false, false, getRule().ele01ParserRuleCallAddition()); + return consumeNonTerminal(additionConsumer, null, false, false, false, getRule().ele01ParserRuleCallAddition()); } protected int consumeKeyword$5(int entryPoint) throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java index 5ba4f85..3c3cf27 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java @@ -62,7 +62,7 @@ public final class SimpleExpressionsTestLanguageSequenceConsumer extends NonTerm } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(additionConsumer, null, false, false, getRule().ele0ParserRuleCallAddition()); + return consumeNonTerminal(additionConsumer, null, false, false, false, getRule().ele0ParserRuleCallAddition()); } protected int consumeGroup$3(int entryPoint) throws Exception { @@ -113,7 +113,7 @@ public final class SimpleExpressionsTestLanguageSequenceConsumer extends NonTerm int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(additionConsumer, "expressions", true, false, getRule().ele110ParserRuleCallAddition()); + tempResult = consumeNonTerminal(additionConsumer, "expressions", true, false, false, getRule().ele110ParserRuleCallAddition()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageTermConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageTermConsumer.java index 9fdf8d9..d7f704f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageTermConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageTermConsumer.java @@ -52,11 +52,11 @@ public final class SimpleExpressionsTestLanguageTermConsumer extends NonTerminal } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(atomConsumer, null, false, false, getRule().ele0ParserRuleCallAtom()); + return consumeNonTerminal(atomConsumer, null, false, false, false, getRule().ele0ParserRuleCallAtom()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(parensConsumer, null, false, false, getRule().ele1ParserRuleCallParens()); + return consumeNonTerminal(parensConsumer, null, false, false, false, getRule().ele1ParserRuleCallParens()); } public TermElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageAbstractRuleConsumer.java index f617fda..2cf3471 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageAbstractRuleConsumer.java @@ -52,11 +52,11 @@ public final class TestLanguageAbstractRuleConsumer extends NonTerminalConsumer } protected int consumeRuleCall$2(int entryPoint) throws Exception { - return consumeNonTerminal(choiceRuleConsumer, null, false, false, getRule().ele0ParserRuleCallChoiceRule()); + return consumeNonTerminal(choiceRuleConsumer, null, false, false, false, getRule().ele0ParserRuleCallChoiceRule()); } protected int consumeRuleCall$3(int entryPoint) throws Exception { - return consumeNonTerminal(reducibleRuleConsumer, null, false, false, getRule().ele1ParserRuleCallReducibleRule()); + return consumeNonTerminal(reducibleRuleConsumer, null, false, false, false, getRule().ele1ParserRuleCallReducibleRule()); } public AbstractRuleElements getRule() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageEntryRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageEntryRuleConsumer.java index 880f0be..6535e14 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageEntryRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageEntryRuleConsumer.java @@ -43,7 +43,7 @@ public final class TestLanguageEntryRuleConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(abstractRuleConsumer, "multiFeature", true, false, getRule().ele0ParserRuleCallAbstractRule()); + tempResult = consumeNonTerminal(abstractRuleConsumer, "multiFeature", true, false, false, getRule().ele0ParserRuleCallAbstractRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java index 71e9556..a867a3d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java @@ -78,7 +78,7 @@ public final class TestLanguageReducibleRuleConsumer extends NonTerminalConsumer } protected int consumeRuleCall$4(int entryPoint) throws Exception { - return consumeNonTerminal(terminalRuleConsumer, null, false, false, getRule().ele01ParserRuleCallTerminalRule()); + return consumeNonTerminal(terminalRuleConsumer, null, false, false, false, getRule().ele01ParserRuleCallTerminalRule()); } protected int consumeGroup$5(int entryPoint) throws Exception { @@ -130,7 +130,7 @@ public final class TestLanguageReducibleRuleConsumer extends NonTerminalConsumer int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(terminalRuleConsumer, "actionFeature", true, false, getRule().ele110ParserRuleCallTerminalRule()); + tempResult = consumeNonTerminal(terminalRuleConsumer, "actionFeature", true, false, false, getRule().ele110ParserRuleCallTerminalRule()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageModelConsumer.java index 737ba7e..81e812b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageModelConsumer.java @@ -43,7 +43,7 @@ public final class TreeTestLanguageModelConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nodeConsumer, "children", true, false, getRule().ele0ParserRuleCallNode()); + tempResult = consumeNonTerminal(nodeConsumer, "children", true, false, false, getRule().ele0ParserRuleCallNode()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java index e9faa32..df29a43 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java @@ -181,7 +181,7 @@ public final class TreeTestLanguageNodeConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(nodeConsumer, "children", true, false, getRule().ele010ParserRuleCallNode()); + tempResult = consumeNonTerminal(nodeConsumer, "children", true, false, false, getRule().ele010ParserRuleCallNode()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext index 6b30d3c..577217f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext @@ -12,7 +12,7 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore generate HiddenTerminalsTestLanguage "http://www.eclipse.org/2008/tmf/xtext/HiddenTerminalsTest" Model: - WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens + WithoutHiddens | WithHiddens | OverridingHiddens | InheritingHiddens | DatatypeHiddens ; WithoutHiddens: @@ -30,6 +30,12 @@ OverridingHiddensCall hidden(): InheritingHiddens hidden(WS, ML_COMMENT, SL_COMMENT): 'inheriting' 'hiddens' '(' (called=InheritingHiddensCall | hidingCalled=HidingHiddens) ')' valid?=';'; +DatatypeHiddens: + 'datatype' valid?=DatatypeRule; + +DatatypeRule returns EString hidden(WS): + 'rule' ';'; + HidingHiddens hidden(): 'hiding' space=WS called=InheritingHiddensCall; diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java index 8513803..d20909a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java @@ -24,6 +24,7 @@ public class HiddensTest extends AbstractGeneratorTest { private EClass overridingHiddens; private EClass inheritingHiddens; private EClass model; + private EClass datatypeHiddens; private EStructuralFeature spacesWithoutHiddens; private EStructuralFeature valid; private EClass overridingHiddensCall; @@ -39,6 +40,7 @@ public class HiddensTest extends AbstractGeneratorTest { EPackage pack = getMetamodelAccess().getGeneratedEPackages()[0]; withoutHiddens = (EClass) pack.getEClassifier("WithoutHiddens"); withHiddens = (EClass) pack.getEClassifier("WithHiddens"); + datatypeHiddens = (EClass) pack.getEClassifier("DatatypeHiddens"); overridingHiddens = (EClass) pack.getEClassifier("OverridingHiddens"); overridingHiddensCall = (EClass) pack.getEClassifier("OverridingHiddensCall"); inheritingHiddens = (EClass) pack.getEClassifier("InheritingHiddens"); @@ -167,4 +169,30 @@ public class HiddensTest extends AbstractGeneratorTest { assertEquals(inheritingHiddens, root.eClass()); assertTrue((Boolean) root.eGet(valid)); } + + public void testDatatypeHiddens_01() throws Exception { + String model = "datatype rule;"; + Resource res = getResourceFromString(model); + assertTrue(res.getErrors().isEmpty()); + EObject root = res.getContents().get(0); + assertNotNull(root); + assertEquals(datatypeHiddens, root.eClass()); + assertTrue((Boolean) root.eGet(valid)); + } + + public void testDatatypeHiddens_02() throws Exception { + String model = "datatype rule ;"; + Resource res = getResourceFromString(model); + assertTrue(res.getErrors().isEmpty()); + EObject root = res.getContents().get(0); + assertNotNull(root); + assertEquals(datatypeHiddens, root.eClass()); + assertTrue((Boolean) root.eGet(valid)); + } + + public void testDatatypeHiddens_03() throws Exception { + String model = "datatype rule /* foo */ ;"; + Resource res = getResourceFromString(model); + assertFalse(res.getErrors().isEmpty()); + } } diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageFileConsumer.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageFileConsumer.java index c94c93a..ef490c2 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageFileConsumer.java +++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageFileConsumer.java @@ -43,7 +43,7 @@ public final class TestLanguageFileConsumer extends NonTerminalConsumer { int result = ConsumeResult.EMPTY_MATCH; int tempResult; announceNextLevel(); - tempResult = consumeNonTerminal(stuffConsumer, "stuff", true, false, getRule().ele0ParserRuleCallStuff()); + tempResult = consumeNonTerminal(stuffConsumer, "stuff", true, false, false, getRule().ele0ParserRuleCallStuff()); if (tempResult == ConsumeResult.SUCCESS) { announceLevelFinished(); return tempResult; diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext index 185fe2a..ac927a3 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext @@ -17,18 +17,6 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_hiddenTokens(ParserRule this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_rule(CrossReference this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_rule(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x)); @@ -41,10 +29,10 @@ List[IScopedElement] scope_metamodel(TypeRef this): List[IScopedElement] scope_metamodel(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_type(TypeRef this): - allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_hiddenTokens(ParserRule this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_type(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_rule(RuleCall this): @@ -53,3 +41,15 @@ List[IScopedElement] scope_rule(RuleCall this): List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_rule(CrossReference this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_rule(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_type(TypeRef this): + allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_type(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java index 980634a..1ba5e07 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java @@ -11,7 +11,7 @@ import org.eclipse.xtext.xtend.contentassist.AbstractXtendProposalProvider; */ public class XtendXtextGrammarTestLanguageProposalProvider extends AbstractXtendProposalProvider { - private static final String UI_PLUGIN_ID = "."; + private static final String UI_PLUGIN_ID = "org.eclipse.xtext.xtend.tests"; @Override protected ClassLoader getClassLoader() { diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore index 050e1ba..6edbed4 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore @@ -20,12 +20,12 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java index d20cb4c..4d2b564 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java @@ -57,14 +57,14 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public InternalXtextGrammarTestLanguageLexer(CharStream input) { super(input); } - public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g"; } + public String getGrammarFileName() { return "../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g"; } // $ANTLR start T11 public final void mT11() throws RecognitionException { try { int _type = T11; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language' { match("abstract language"); @@ -82,8 +82,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT12() throws RecognitionException { try { int _type = T12; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language' { match("language"); @@ -101,8 +101,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT13() throws RecognitionException { try { int _type = T13; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:7: '.' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:7: '.' { match('.'); @@ -119,8 +119,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT14() throws RecognitionException { try { int _type = T14; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends' { match("extends"); @@ -138,8 +138,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT15() throws RecognitionException { try { int _type = T15; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate' { match("generate"); @@ -157,8 +157,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT16() throws RecognitionException { try { int _type = T16; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as' { match("as"); @@ -176,8 +176,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT17() throws RecognitionException { try { int _type = T17; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import' { match("import"); @@ -195,8 +195,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT18() throws RecognitionException { try { int _type = T18; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native' { match("native"); @@ -214,8 +214,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT19() throws RecognitionException { try { int _type = T19; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer' { match("lexer"); @@ -233,8 +233,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT20() throws RecognitionException { try { int _type = T20; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns' { match("returns"); @@ -252,8 +252,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT21() throws RecognitionException { try { int _type = T21; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:20:7: ':' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:20:7: ':' { match(':'); @@ -270,8 +270,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT22() throws RecognitionException { try { int _type = T22; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:21:7: ';' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:21:7: ';' { match(';'); @@ -288,8 +288,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT23() throws RecognitionException { try { int _type = T23; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:22:5: ( 'hidden' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:22:7: 'hidden' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:22:5: ( 'hidden' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:22:7: 'hidden' { match("hidden"); @@ -307,8 +307,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT24() throws RecognitionException { try { int _type = T24; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '(' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:23:7: '(' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '(' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:23:7: '(' { match('('); @@ -325,8 +325,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT25() throws RecognitionException { try { int _type = T25; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:24:5: ( ',' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:24:7: ',' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:24:5: ( ',' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:24:7: ',' { match(','); @@ -343,8 +343,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT26() throws RecognitionException { try { int _type = T26; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:25:5: ( ')' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:25:7: ')' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:25:5: ( ')' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:25:7: ')' { match(')'); @@ -361,8 +361,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT27() throws RecognitionException { try { int _type = T27; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:26:5: ( 'terminal' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:26:7: 'terminal' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:26:5: ( 'terminal' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:26:7: 'terminal' { match("terminal"); @@ -380,8 +380,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT28() throws RecognitionException { try { int _type = T28; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '::' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:27:7: '::' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '::' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:27:7: '::' { match("::"); @@ -399,8 +399,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT29() throws RecognitionException { try { int _type = T29; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '|' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:28:7: '|' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '|' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:28:7: '|' { match('|'); @@ -417,8 +417,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT30() throws RecognitionException { try { int _type = T30; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:29:7: '?' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:29:7: '?' { match('?'); @@ -435,8 +435,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT31() throws RecognitionException { try { int _type = T31; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '*' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:30:7: '*' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '*' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:30:7: '*' { match('*'); @@ -453,8 +453,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT32() throws RecognitionException { try { int _type = T32; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:31:5: ( '+' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:31:7: '+' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:31:5: ( '+' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:31:7: '+' { match('+'); @@ -471,8 +471,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT33() throws RecognitionException { try { int _type = T33; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '+=' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:32:7: '+=' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '+=' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:32:7: '+=' { match("+="); @@ -490,8 +490,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT34() throws RecognitionException { try { int _type = T34; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '=' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:33:7: '=' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '=' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:33:7: '=' { match('='); @@ -508,8 +508,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT35() throws RecognitionException { try { int _type = T35; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:34:5: ( '?=' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:34:7: '?=' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:34:5: ( '?=' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:34:7: '?=' { match("?="); @@ -527,8 +527,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT36() throws RecognitionException { try { int _type = T36; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '{' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:35:7: '{' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '{' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:35:7: '{' { match('{'); @@ -545,8 +545,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT37() throws RecognitionException { try { int _type = T37; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:36:5: ( 'current' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:36:7: 'current' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:36:5: ( 'current' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:36:7: 'current' { match("current"); @@ -564,8 +564,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT38() throws RecognitionException { try { int _type = T38; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:37:5: ( '}' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:37:7: '}' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:37:5: ( '}' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:37:7: '}' { match('}'); @@ -582,8 +582,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT39() throws RecognitionException { try { int _type = T39; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:38:5: ( '!' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:38:7: '!' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:38:5: ( '!' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:38:7: '!' { match('!'); @@ -600,8 +600,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT40() throws RecognitionException { try { int _type = T40; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:39:5: ( '->' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:39:7: '->' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:39:5: ( '->' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:39:7: '->' { match("->"); @@ -619,8 +619,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT41() throws RecognitionException { try { int _type = T41; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:40:5: ( '..' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:40:7: '..' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:40:5: ( '..' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:40:7: '..' { match(".."); @@ -638,8 +638,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT42() throws RecognitionException { try { int _type = T42; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:41:5: ( '[' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:41:7: '[' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:41:5: ( '[' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:41:7: '[' { match('['); @@ -656,8 +656,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT43() throws RecognitionException { try { int _type = T43; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:42:5: ( ']' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:42:7: ']' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:42:5: ( ']' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:42:7: ']' { match(']'); @@ -674,10 +674,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:11: ( '^' )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -686,7 +686,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:12: '^' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:12: '^' { match('^'); @@ -705,7 +705,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2219:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -718,7 +718,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g: + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g: { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -753,10 +753,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -770,7 +770,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:13: '0' .. '9' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2221:13: '0' .. '9' { matchRange('0','9'); @@ -800,7 +800,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -818,10 +818,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -837,7 +837,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) { @@ -854,7 +854,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:65: ~ ( '\\\\' | '\"' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -880,10 +880,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -899,7 +899,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) { @@ -916,7 +916,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:152: ~ ( '\\\\' | '\\'' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2223:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -954,12 +954,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -984,7 +984,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:52: . + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2225:52: . { matchAny(); @@ -1013,12 +1013,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:24: (~ ( '\\n' | '\\r' ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -1031,7 +1031,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:24: ~ ( '\\n' | '\\r' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:24: ~ ( '\\n' | '\\r' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1052,7 +1052,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:38: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -1061,9 +1061,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: ( '\\r' )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -1072,7 +1072,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: '\\r' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2227:39: '\\r' { match('\r'); @@ -1103,10 +1103,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2229:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -1120,7 +1120,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt11) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g: + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g: { if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) { input.consume(); @@ -1160,8 +1160,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2231:16: ( . ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2231:18: . + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2231:16: ( . ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2231:18: . { matchAny(); @@ -1175,7 +1175,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { // $ANTLR end RULE_ANY_OTHER public void mTokens() throws RecognitionException { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) int alt12=40; int LA12_0 = input.LA(1); @@ -1823,280 +1823,280 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt12) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:10: T11 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:10: T11 { mT11(); } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:14: T12 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:14: T12 { mT12(); } break; case 3 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:18: T13 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:18: T13 { mT13(); } break; case 4 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:22: T14 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:22: T14 { mT14(); } break; case 5 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:26: T15 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:26: T15 { mT15(); } break; case 6 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:30: T16 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:30: T16 { mT16(); } break; case 7 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:34: T17 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:34: T17 { mT17(); } break; case 8 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:38: T18 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:38: T18 { mT18(); } break; case 9 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:42: T19 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:42: T19 { mT19(); } break; case 10 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:46: T20 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:46: T20 { mT20(); } break; case 11 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:50: T21 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:50: T21 { mT21(); } break; case 12 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:54: T22 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:54: T22 { mT22(); } break; case 13 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:58: T23 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:58: T23 { mT23(); } break; case 14 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:62: T24 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:62: T24 { mT24(); } break; case 15 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:66: T25 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:66: T25 { mT25(); } break; case 16 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:70: T26 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:70: T26 { mT26(); } break; case 17 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:74: T27 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:74: T27 { mT27(); } break; case 18 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:78: T28 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:78: T28 { mT28(); } break; case 19 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:82: T29 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:82: T29 { mT29(); } break; case 20 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:86: T30 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:86: T30 { mT30(); } break; case 21 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:90: T31 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:90: T31 { mT31(); } break; case 22 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:94: T32 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:94: T32 { mT32(); } break; case 23 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:98: T33 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:98: T33 { mT33(); } break; case 24 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:102: T34 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:102: T34 { mT34(); } break; case 25 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:106: T35 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:106: T35 { mT35(); } break; case 26 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:110: T36 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:110: T36 { mT36(); } break; case 27 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:114: T37 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:114: T37 { mT37(); } break; case 28 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:118: T38 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:118: T38 { mT38(); } break; case 29 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:122: T39 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:122: T39 { mT39(); } break; case 30 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:126: T40 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:126: T40 { mT40(); } break; case 31 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:130: T41 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:130: T41 { mT41(); } break; case 32 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:134: T42 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:134: T42 { mT42(); } break; case 33 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:138: T43 + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:138: T43 { mT43(); } break; case 34 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:142: RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:142: RULE_ID { mRULE_ID(); } break; case 35 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:150: RULE_INT + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:150: RULE_INT { mRULE_INT(); } break; case 36 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:159: RULE_STRING + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:159: RULE_STRING { mRULE_STRING(); } break; case 37 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:171: RULE_ML_COMMENT + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:171: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 38 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_SL_COMMENT + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 39 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:203: RULE_WS + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:203: RULE_WS { mRULE_WS(); } break; case 40 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:211: RULE_ANY_OTHER + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1:211: RULE_ANY_OTHER { mRULE_ANY_OTHER(); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java index 09d9031..c83d9bf 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java @@ -39,7 +39,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl public String[] getTokenNames() { return tokenNames; } - public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g"; } + public String getGrammarFileName() { return "../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g"; } @@ -63,7 +63,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start entryRuleGrammar - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:68:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:68:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ; public final EObject entryRuleGrammar() throws RecognitionException { EObject current = null; @@ -71,8 +71,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:68:49: (iv_ruleGrammar= ruleGrammar EOF ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:69:2: iv_ruleGrammar= ruleGrammar EOF + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:68:49: (iv_ruleGrammar= ruleGrammar EOF ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:69:2: iv_ruleGrammar= ruleGrammar EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleGrammar_in_entryRuleGrammar72); @@ -98,7 +98,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleGrammar - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:76:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:76:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ; public final EObject ruleGrammar() throws RecognitionException { EObject current = null; @@ -114,25 +114,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:82:6: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:82:6: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:6: ( (lv_abstract= 'abstract language' ) | 'language' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:6: ( (lv_abstract= 'abstract language' ) | 'language' ) int alt1=2; int LA1_0 = input.LA(1); @@ -150,10 +150,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:7: (lv_abstract= 'abstract language' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:7: (lv_abstract= 'abstract language' ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:7: (lv_abstract= 'abstract language' ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:85:6: lv_abstract= 'abstract language' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:7: (lv_abstract= 'abstract language' ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:85:6: lv_abstract= 'abstract language' { lv_abstract=(Token)input.LT(1); match(input,11,FOLLOW_11_in_ruleGrammar133); @@ -179,7 +179,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:104:6: 'language' + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:104:6: 'language' { match(input,12,FOLLOW_12_in_ruleGrammar160); @@ -191,8 +191,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:2: (lv_idElements= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:110:6: lv_idElements= RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:2: (lv_idElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:110:6: lv_idElements= RULE_ID { lv_idElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar182); @@ -217,7 +217,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:128:3: ( '.' (lv_idElements= RULE_ID ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:128:3: ( '.' (lv_idElements= RULE_ID ) )* loop2: do { int alt2=2; @@ -230,14 +230,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:128:4: '.' (lv_idElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:128:4: '.' (lv_idElements= RULE_ID ) { match(input,13,FOLLOW_13_in_ruleGrammar204); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:132:1: (lv_idElements= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:134:6: lv_idElements= RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:132:1: (lv_idElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:134:6: lv_idElements= RULE_ID { lv_idElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar225); @@ -271,7 +271,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? int alt4=2; int LA4_0 = input.LA(1); @@ -280,17 +280,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:7: 'extends' (lv_superGrammarIdElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:7: 'extends' (lv_superGrammarIdElements= RULE_ID ) { match(input,14,FOLLOW_14_in_ruleGrammar250); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:156:1: (lv_superGrammarIdElements= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:158:6: lv_superGrammarIdElements= RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:156:1: (lv_superGrammarIdElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:158:6: lv_superGrammarIdElements= RULE_ID { lv_superGrammarIdElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar271); @@ -315,7 +315,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:176:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:176:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )* loop3: do { int alt3=2; @@ -328,14 +328,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:176:4: '.' (lv_superGrammarIdElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:176:4: '.' (lv_superGrammarIdElements= RULE_ID ) { match(input,13,FOLLOW_13_in_ruleGrammar293); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:180:1: (lv_superGrammarIdElements= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:182:6: lv_superGrammarIdElements= RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:180:1: (lv_superGrammarIdElements= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:182:6: lv_superGrammarIdElements= RULE_ID { lv_superGrammarIdElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar314); @@ -375,7 +375,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:200:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:200:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* loop5: do { int alt5=2; @@ -388,7 +388,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:203:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:203:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -422,7 +422,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:221:4: (lv_rules= ruleAbstractRule )+ + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:221:4: (lv_rules= ruleAbstractRule )+ int cnt6=0; loop6: do { @@ -436,7 +436,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:224:6: lv_rules= ruleAbstractRule + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:224:6: lv_rules= ruleAbstractRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -494,7 +494,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start entryRuleAbstractRule - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:251:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:251:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ; public final EObject entryRuleAbstractRule() throws RecognitionException { EObject current = null; @@ -502,8 +502,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:251:54: (iv_ruleAbstractRule= ruleAbstractRule EOF ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:252:2: iv_ruleAbstractRule= ruleAbstractRule EOF + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:251:54: (iv_ruleAbstractRule= ruleAbstractRule EOF ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:252:2: iv_ruleAbstractRule= ruleAbstractRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule444); @@ -529,7 +529,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleAbstractRule - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:259:1: ruleAbstractRule returns [EObject current=null] : ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:259:1: ruleAbstractRule returns [EObject current=null] : ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) ; public final EObject ruleAbstractRule() throws RecognitionException { EObject current = null; @@ -543,10 +543,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:263:6: ( ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:1: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:263:6: ( ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:1: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:1: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:1: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) | this_TerminalRule= ruleTerminalRule ) int alt8=2; int LA8_0 = input.LA(1); @@ -564,9 +564,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:2: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:2: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:2: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:264:2: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) int alt7=2; int LA7_0 = input.LA(1); @@ -584,7 +584,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:265:5: this_LexerRule= ruleLexerRule + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:265:5: this_LexerRule= ruleLexerRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); @@ -601,7 +601,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:275:5: this_ParserRule= ruleParserRule + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:275:5: this_ParserRule= ruleParserRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); @@ -624,7 +624,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:285:5: this_TerminalRule= ruleTerminalRule + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:285:5: this_TerminalRule= ruleTerminalRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -662,7 +662,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start entryRuleAbstractMetamodelDeclaration - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:302:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:302:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ; public final EObject entryRuleAbstractMetamodelDeclaration() throws RecognitionException { EObject current = null; @@ -670,8 +670,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:302:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:303:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:302:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:303:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration591); @@ -697,7 +697,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleAbstractMetamodelDeclaration - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:310:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:310:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ; public final EObject ruleAbstractMetamodelDeclaration() throws RecognitionException { EObject current = null; @@ -709,10 +709,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:314:6: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:315:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:314:6: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:315:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:315:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:315:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) int alt9=2; int LA9_0 = input.LA(1); @@ -730,7 +730,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:316:5: this_GeneratedMetamodel= ruleGeneratedMetamodel + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:316:5: this_GeneratedMetamodel= ruleGeneratedMetamodel { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode); @@ -747,7 +747,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:326:5: this_ReferencedMetamodel= ruleReferencedMetamodel + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:326:5: this_ReferencedMetamodel= ruleReferencedMetamodel { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -785,7 +785,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start entryRuleGeneratedMetamodel - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:343:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:343:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ; public final EObject entryRuleGeneratedMetamodel() throws RecognitionException { EObject current = null; @@ -793,8 +793,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:343:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:344:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:343:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:344:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel709); @@ -820,7 +820,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl // $ANTLR start ruleGeneratedMetamodel - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:351:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:351:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; public final EObject ruleGeneratedMetamodel() throws RecognitionException { EObject current = null; @@ -830,24 +830,24 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:355:6: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:355:6: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:2: ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:2: ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) ( 'as' (lv_alias= RULE_ID ) )? { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:2: ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:3: ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:2: ( ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:3: ( 'generate' (lv_name= RULE_ID ) ) ( ( RULE_STRING ) ) { - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:3: ( 'generate' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:4: 'generate' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:3: ( 'generate' (lv_name= RULE_ID ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:356:4: 'generate' (lv_name= RULE_ID ) { match(input,15,FOLLOW_15_in_ruleGeneratedMetamodel755); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:360:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:362:6: lv_name= RULE_ID + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:360:1: (lv_name= RULE_ID ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:362:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel776); @@ -872,8 +872,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl } - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:380:3: ( ( RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:383:3: ( RULE_STRING ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:380:3: ( ( RULE_STRING ) ) + // ../org.eclipse.xtext.xtend.tests/./src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:383:3: ( RULE_STRING ) { if (current==null) { @@ -881,8 +881,8 @@ public class InternalXtextGram |