| author | szarnekow | 2009-02-10 10:48:05 (EST) |
|---|---|---|
| committer | sefftinge | 2009-02-10 10:48:05 (EST) |
| commit | f93222420c181383d975d909d01458e04069733b (patch) (side-by-side diff) | |
| tree | 9a53af969ba235bbd462f2b635e7bfddafbd3865 | |
| parent | fd37c928ba0c829edb6d30e87be348f5810498af (diff) | |
| download | org.eclipse.xtext-f93222420c181383d975d909d01458e04069733b.zip org.eclipse.xtext-f93222420c181383d975d909d01458e04069733b.tar.gz org.eclipse.xtext-f93222420c181383d975d909d01458e04069733b.tar.bz2 | |
Fix: Datatype rules cannot be used in cross refs (https://bugs.eclipse.org/bugs/show_bug.cgi?id=263240)
Feature: superGrammar is linked via crossRef (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=256394)
363 files changed, 698 insertions, 337 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore index e9ccfbe..dfce531 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore @@ -16,12 +16,12 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Person"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="age"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="age"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/> <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/> diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi index d78ba99..52cd581 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.reference.ReferenceGrammar"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar"> <ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/> </metamodelDeclarations> @@ -18,13 +19,13 @@ <abstractTokens xsi:type="xtext:Keyword" value="spielplatz"/> <abstractTokens xsi:type="xtext:Assignment" feature="groesse" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="beschreibung" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -79,13 +80,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -105,13 +106,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -131,7 +132,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -161,11 +162,11 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="keyword"/> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> </groups> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </groups> </terminal> </abstractTokens> @@ -175,7 +176,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -184,7 +185,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -193,7 +194,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -204,7 +205,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -237,7 +238,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="type"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java index b2cf66e..64d3da9 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java @@ -32,6 +32,7 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java index 3c13d75..728ca11 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java @@ -43,6 +43,7 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java index c6029df..06e17d2 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java @@ -61,6 +61,7 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { ruleCall$15$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java index cd905db..20557aa 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java @@ -36,6 +36,7 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java index 024d1bc..b3fd96d 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java @@ -43,6 +43,7 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6881167..d8ae000 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 @@ -28,6 +28,7 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 db4e6ed..0436c67 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 @@ -53,6 +53,7 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 eb4d337..59c1a1b 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 @@ -40,6 +40,7 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi index 5a0261f..63442bf 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.example.Domainmodel"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="domainmodel"> <ePackage href="http://www.example.xtext/Domainmodel#/"/> </metamodelDeclarations> @@ -27,7 +28,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="import"/> <abstractTokens xsi:type="xtext:Assignment" feature="importURI" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -80,7 +81,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="datatype"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -97,7 +98,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="entity"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -108,7 +109,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Entity"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -150,7 +151,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="attr"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -172,7 +173,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="ref"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -189,7 +190,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Reference"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -208,7 +209,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="op"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -242,7 +243,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> @@ -268,7 +269,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.example.xtext/Domainmodel#//Type"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> @@ -278,12 +279,12 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> </abstractTokens> </alternatives> 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 4bcb073..ad78d2d 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 @@ -37,6 +37,7 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java index c03595a..f6250f4 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java @@ -32,6 +32,7 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 f65f7d3..105f3be 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 @@ -46,6 +46,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 56f7c9e..a6b6e56 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 @@ -28,6 +28,7 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 96186ec..c785c51 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 @@ -28,6 +28,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java index 28a7174..c908886 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java @@ -32,6 +32,7 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6eb0220..713d941 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 @@ -28,6 +28,7 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 0fb0f52..75c0ea2 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 @@ -48,6 +48,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 b0a3e7f..0b13490 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 @@ -37,6 +37,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 5411931..3bf346a 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 @@ -31,6 +31,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java index bc14a5b..d1b179e 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java @@ -35,6 +35,7 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 71f62b7..3e6cd04 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 @@ -43,6 +43,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 772cf7b..3624f75 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 @@ -28,6 +28,7 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 eec1636..aa1ab2a 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 @@ -28,6 +28,7 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java index 3aedad8..11eab9d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java @@ -29,6 +29,7 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 c83fa55..1043b86 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 @@ -28,6 +28,7 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi index 1499a07..66963ef 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.example.EcoreDsl"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> @@ -30,7 +31,7 @@ <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> @@ -38,7 +39,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="importURI" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -75,7 +76,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="nsURI" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -117,7 +118,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -165,7 +166,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="datatype"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -194,7 +195,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="@"/> <abstractTokens xsi:type="xtext:Assignment" feature="source" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -203,7 +204,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -252,7 +253,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -384,7 +385,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -400,7 +401,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -408,7 +409,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="="/> <abstractTokens xsi:type="xtext:Assignment" feature="defaultValueLiteral" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -486,7 +487,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="lowerBound" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -507,14 +508,14 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -537,7 +538,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -563,7 +564,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -571,14 +572,14 @@ <abstractTokens xsi:type="xtext:Keyword" value="="/> <abstractTokens xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="literal" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -592,7 +593,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -614,7 +615,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -642,7 +643,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </groups> @@ -660,7 +661,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -688,7 +689,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypeParameter"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </groups> @@ -749,7 +750,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -820,7 +821,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -839,14 +840,14 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="detailKey" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="detailValue" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -869,7 +870,7 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Alternatives"> @@ -877,7 +878,7 @@ <groups xsi:type="xtext:Keyword" value="$"/> </abstractTokens> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> </abstractTokens> </alternatives> @@ -888,7 +889,7 @@ </type> <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> <groups xsi:type="xtext:RuleCall" rule="//@rules.21"/> </alternatives> @@ -900,7 +901,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="-"/> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </abstractTokens> </alternatives> </rules> 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 d6d54ed..25ce36a 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 @@ -48,6 +48,7 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer { ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 a032e7a..e0e7b0d 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 @@ -87,6 +87,7 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer { ruleCall$52$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 966a7c0..81871c5 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 @@ -74,6 +74,7 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer { ruleCall$19$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 53275ea..6e69d1c 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 @@ -28,6 +28,7 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 94c027f..d225e1b 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 @@ -47,6 +47,7 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer { ruleCall$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 2765f8e..494b3bc 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 @@ -42,6 +42,7 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer { ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4657784..7ace86e 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 @@ -47,6 +47,7 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer ruleCall$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4436973..6938b6c 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 @@ -55,6 +55,7 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer keyword$31$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 cc7cd64..73cfb80 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 @@ -46,6 +46,7 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal keyword$18$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 1db2763..206d94e 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 @@ -76,6 +76,7 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer { ruleCall$24$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 39c1809..93520b0 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 @@ -58,6 +58,7 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer { ruleCall$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 603bdef..c4b425a 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 @@ -33,6 +33,7 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer { ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6c6dd89..5280c9e 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 @@ -88,6 +88,7 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer { ruleCall$56$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 066079e..16f621b 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 @@ -28,6 +28,7 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 85d3041..748070b 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 @@ -34,6 +34,7 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 766d4b2..d040e1d 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 @@ -28,6 +28,7 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java index 73427a5..e98ee0b 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java @@ -43,6 +43,7 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java index b3e775e..b63cbcb 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java @@ -37,6 +37,7 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 10631ae..3d04452 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 @@ -26,6 +26,7 @@ public final class EcoreDslMapEntrySuperConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeRuleCall$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java index f6450d9..c32743c 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java @@ -33,6 +33,7 @@ public final class EcoreDslMultiplicityExprConsumer extends NonTerminalConsumer keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java index 41ab915..fdab571 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java @@ -38,6 +38,7 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java index cd99289..ad7337a 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java @@ -32,6 +32,7 @@ public final class EcoreDslSINTConsumer extends NonTerminalConsumer { ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 c07bd82..d7c3242 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 @@ -31,6 +31,7 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer { ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 fd3a057..a594d71 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 @@ -44,6 +44,7 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer { ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java index 3e4e6c1..5d31c67 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.ecore.impl.EcoreFactoryImpl; +import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.xtext.builtin.conversion.XtextBuiltInConverters; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; @@ -29,8 +29,6 @@ import org.eclipse.xtext.diagnostics.IDiagnosticProducer; import org.eclipse.xtext.parser.DefaultEcoreElementFactory; import org.eclipse.xtext.parsetree.AbstractNode; -import com.google.inject.Binder; - /** * Used to register components to be used within the IDE. * @@ -42,19 +40,16 @@ public class EcoreDslRuntimeModule extends AbstractEcoreDslRuntimeModule { protected final Logger logger = Logger.getLogger(getClass()); @Override - public void configure(Binder binder) { - super.configure(binder); - } - - public Class<? extends org.eclipse.xtext.crossref.ILinker> bindILinker() { return EcoreDslRuntimeModule.EcoreDslLinker.class; } + @Override public Class<? extends org.eclipse.xtext.parser.IAstFactory> bindIAstFactory() { return EcoreDslRuntimeModule.EcoreDslElementFactory.class; } + @Override public Class<? extends org.eclipse.xtext.conversion.IValueConverterService> bindIValueConverterService() { return EcoreDslRuntimeModule.EcoreDslConverters.class; } @@ -64,6 +59,7 @@ public class EcoreDslRuntimeModule extends AbstractEcoreDslRuntimeModule { @ValueConverter(rule = "SINT") public IValueConverter<Integer> SINT() { return new AbstractToStringConverter<Integer>() { + @Override public Integer internalToValue(String string, AbstractNode node) { return Integer.valueOf(string); } @@ -81,11 +77,12 @@ public class EcoreDslRuntimeModule extends AbstractEcoreDslRuntimeModule { protected void setDefaultValueImpl(EObject obj, EReference ref, IDiagnosticProducer producer) { //hack: ePackage always needs an eFactoryInstance (gets cleared in #clearReferences?) if (ref.getName().equalsIgnoreCase("eFactoryInstance")) { - ((EPackage) obj).setEFactoryInstance(EcoreFactoryImpl.eINSTANCE.createEFactory()); + ((EPackage) obj).setEFactoryInstance(EcoreFactory.eINSTANCE.createEFactory()); } super.setDefaultValueImpl(obj, ref, producer); } + @Override protected void clearReferences(EObject obj) { EList<EReference> allReferences = obj instanceof EClass ? ((EClass) obj).getEAllReferences() : obj.eClass() .getEAllReferences(); diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi index a5edea2..df5883f 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.example.FowlerDsl"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl"> <ePackage href="http://example.xtext.org/FowlerDsl#/"/> </metamodelDeclarations> @@ -44,13 +45,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="code" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -62,12 +63,12 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="code" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -83,7 +84,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="state"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -98,7 +99,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDsl#//Command"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -123,7 +124,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDsl#//Event"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="=>"/> @@ -133,7 +134,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDsl#//State"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java index bd0e59d..c898460 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java @@ -32,6 +32,7 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer { ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java index 5e73603..28d4b96 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java @@ -35,6 +35,7 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer { ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 54c04c0..1d11c3c 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 @@ -49,6 +49,7 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 3827dec..1b37e7a 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 @@ -42,6 +42,7 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java index e376f73..935052f 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java @@ -35,6 +35,7 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer { keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java index eb0a4f0..607474a 100644 --- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java +++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java @@ -30,6 +30,7 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.crossref.ILinkingService; +import org.eclipse.xtext.crossref.impl.IllegalNodeException; import org.eclipse.xtext.parsetree.AbstractNode; import org.eclipse.xtext.parsetree.LeafNode; import org.eclipse.xtext.parsetree.NodeUtil; @@ -186,10 +187,11 @@ public class DefaultContentAssistCalculator extends XtextSwitch<List<AbstractEle if (referencedObjects.isEmpty()) return false; - else { - List<EObject> linkCandidates = linkingService.getLinkedObjects(semanticModel, eReference, - (LeafNode) lastCompleteNode); + try { + List<EObject> linkCandidates = linkingService.getLinkedObjects(semanticModel, eReference, lastCompleteNode); return !linkCandidates.isEmpty() && referencedObjects.containsAll(linkCandidates); + } catch( IllegalNodeException ex) { + return false; } } diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/DefaultHyperlinkDetector.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/DefaultHyperlinkDetector.java index df37d02..ab384a2 100644 --- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/DefaultHyperlinkDetector.java +++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/DefaultHyperlinkDetector.java @@ -32,6 +32,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.crossref.ILinkingService; +import org.eclipse.xtext.crossref.impl.IllegalNodeException; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.parsetree.AbstractNode; import org.eclipse.xtext.parsetree.LeafNode; @@ -135,8 +136,12 @@ public class DefaultHyperlinkDetector extends org.eclipse.core.commands.Abstract if (node instanceof LeafNode && node.getGrammarElement() instanceof CrossReference) { EObject semanticModel = NodeUtil.getNearestSemanticObject(node); EReference eReference = GrammarUtil.getReference((CrossReference) node.getGrammarElement(), - semanticModel.eClass()); - return linkingService.getLinkedObjects(semanticModel, eReference, (LeafNode) node); + semanticModel.eClass()); + try { + return linkingService.getLinkedObjects(semanticModel, eReference, node); + } catch (IllegalNodeException ex) { + return Collections.emptyList(); + } } return Collections.emptyList(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index baee6ce..aee9bcf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.XtextGrammarTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="XtextTest"> <ePackage href="http://www.eclipse.org/2008/Test/XtextTest#/"/> </metamodelDeclarations> @@ -24,7 +25,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="idElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -32,7 +33,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="idElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -42,7 +43,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="extends"/> <abstractTokens xsi:type="xtext:Assignment" feature="superGrammarIdElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -50,7 +51,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="superGrammarIdElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -70,7 +71,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> @@ -80,7 +81,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -129,7 +130,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="generate"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -138,7 +139,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -146,7 +147,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="as"/> <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -164,7 +165,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -172,7 +173,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="as"/> <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -193,7 +194,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -208,7 +209,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="body" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -226,7 +227,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -250,7 +251,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> @@ -260,7 +261,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -292,7 +293,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -323,7 +324,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractMetamodelDeclaration"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="::"/> @@ -333,7 +334,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -464,7 +465,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="operator" operator="="> @@ -507,7 +508,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -635,7 +636,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -673,7 +674,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </alternatives> </rules> @@ -686,7 +687,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi index 27d9adc..61954c8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.crossrefs.ImportUriTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="importedURI"> <ePackage href="http://eclipse.org/xtext/importUriTestLanguage#/"/> </metamodelDeclarations> @@ -24,7 +25,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="import"/> <abstractTokens xsi:type="xtext:Assignment" feature="importURI" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -39,7 +40,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="type"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -50,7 +51,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/importUriTestLanguage#//Type"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi index a3baa66..cf16451 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.crossrefs.LangATestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="langATestLanguage"> <ePackage href="http://eclipse.org/xtext/langATestLanguage#/"/> </metamodelDeclarations> @@ -24,7 +25,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="import"/> <abstractTokens xsi:type="xtext:Assignment" feature="uri" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -39,7 +40,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="type"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -50,7 +51,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/langATestLanguage#//Type"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java index 94d2936..6e1ea65 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java @@ -32,6 +32,7 @@ public final class ImportUriTestLanguageImportConsumer extends NonTerminalConsum ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 19cc47a..550121e 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 @@ -28,6 +28,7 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java index a41e4ac..3d6c4bd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java @@ -38,6 +38,7 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java index 30afb4b..17eee4e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java @@ -32,6 +32,7 @@ public final class LangATestLanguageImportConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 3d79bee..c49b61a 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 @@ -28,6 +28,7 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java index 71e4819..6c3ffc6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java @@ -38,6 +38,7 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer { ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi index ee90414..8e01c31 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.dummy.DummyTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="DummyLang"> <ePackage href="http://www.eclipse.org/2008/xtext/DummyLang#/"/> </metamodelDeclarations> @@ -26,13 +27,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="descriptions" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java index 5f88c2e..eab7d7d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java @@ -43,6 +43,7 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 cfb8fe5..cb2f1e6 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 @@ -26,6 +26,7 @@ public final class DummyTestLanguageModelConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi index d3f7cb2..f053062 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.generator.lowerCaseNamedTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="lowerCaseNamedTestLanguage"> <ePackage href="http://www.eclipse.org/2009/tmf/xtext/lowerCaseNamedTestLanguage#/"/> </metamodelDeclarations> @@ -9,7 +10,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java index 654cf3a..13535a3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java @@ -29,6 +29,7 @@ public final class LowerCaseNamedTestLanguageModelConsumer extends NonTerminalCo ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi index 017d9f1..c1cd744 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" abstract="true" name="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm"> <ePackage href="classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore#/"/> </metamodelDeclarations> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi index b1c9f1d..337a4b8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> -<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage" superGrammarName="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage"> +<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="foo"> <ePackage href="http://holla#/"/> </metamodelDeclarations> 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 943dc9f..913d19e 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 @@ -29,6 +29,7 @@ public final class AbstractTestLanguageAbstractCallExtendedParserRuleConsumer ex keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 8cbca09..6d04b11 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 @@ -29,6 +29,7 @@ public final class AbstractTestLanguageAbstractCallOverridenParserRuleConsumer e keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java index e4d6b93..1efb847 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java @@ -32,6 +32,7 @@ public final class AbstractTestLanguageExtendableParserRuleConsumer extends NonT ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java index 50286cc..b6c58e8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java @@ -32,6 +32,7 @@ public final class AbstractTestLanguageInheritedParserRuleConsumer extends NonTe ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java index 8c37da3..020a67a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java @@ -32,6 +32,7 @@ public final class AbstractTestLanguageOverridableParserRuleConsumer extends Non ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 387d1bb..bb14a14 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 @@ -37,6 +37,7 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 71252f2..a49282b 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 @@ -26,6 +26,7 @@ public final class ConcreteTestLanguageRootRuleConsumer extends NonTerminalConsu super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeRuleCall$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi index c1c7ec1..01dc5eb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="xtext"> <ePackage href="http://www.eclipse.org/2008/Xtext#/"/> </metamodelDeclarations> @@ -13,7 +14,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="nameRefs" operator="+="> @@ -30,7 +31,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Xtext#//ParserRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> @@ -40,7 +41,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi index fea22ef..4bb4b68 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="SimpleTest"> <ePackage href="http://eclipse.org/xtext/tests/SimpleTest#/"/> </metamodelDeclarations> @@ -13,7 +14,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="nameRefs" operator="+="> @@ -27,7 +28,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </alternatives> </rules> 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 005e551..a69d44c 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 @@ -31,6 +31,7 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java index abb6b61..08e212d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java @@ -29,6 +29,7 @@ public final class MetamodelRefTestLanguageMyRuleConsumer extends NonTerminalCon ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java index 775aa1b..7ccd77a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java @@ -29,6 +29,7 @@ public final class MetamodelRefTestLanguageNameRefConsumer extends NonTerminalCo crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 33b0d1d..5d111d1 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 @@ -31,6 +31,7 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java index 22955ff..302f6dc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java @@ -29,6 +29,7 @@ public final class MultiGenMMTestLanguageNameRefConsumer extends NonTerminalCons ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi index 21dcc55..955a7b1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> @@ -56,12 +57,12 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="."/> </abstractTokens> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </abstractTokens> </alternatives> </rules> @@ -83,12 +84,12 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Keyword" value="/"/> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </abstractTokens> </abstractTokens> </alternatives> @@ -102,11 +103,11 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="("/> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value=")"/> 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 c8bc641..4b63c0c 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 @@ -26,6 +26,7 @@ public final class DatatypeRulesTestLanguageCompositeModelConsumer extends NonTe super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java index ee4fddd..9262dea 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java @@ -33,6 +33,7 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java index f7266e7..9ca4ced 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java @@ -35,6 +35,7 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4b2019a..6eebc9c 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 @@ -44,6 +44,7 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon keyword$19$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java index 9edabe4..f8c4069 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java @@ -35,6 +35,7 @@ public final class DatatypeRulesTestLanguageModelIdConsumer extends NonTerminalC ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 b3a0b2e..46953bf 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 @@ -29,6 +29,7 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java index 74aa002..c686744 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java @@ -38,6 +38,7 @@ public final class DatatypeRulesTestLanguageVectorConsumer extends NonTerminalCo ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 aa0a3c0..38a701c 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,11 +48,11 @@ <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" upperBound="-1" eType="//Assignment" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="leftMig" eType="//Migration" 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" 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"> <eStructuralFeatures xsi:type="ecore:EReference" name="leftRes" eType="//NamedResource"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi index 9d7529d..4a9b6e3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.epatch.EpatchTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="EpatchTestLanguage"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#/"/> </metamodelDeclarations> @@ -16,7 +17,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="epatch"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -68,7 +69,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="import"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -76,7 +77,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="uri" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -91,7 +92,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="import"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -99,7 +100,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="nsURI" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -116,7 +117,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="path" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -124,7 +125,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="path" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -142,7 +143,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="path" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -150,7 +151,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="::"/> <abstractTokens xsi:type="xtext:Assignment" feature="path" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -172,7 +173,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="resource"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -185,7 +186,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="uri"/> <abstractTokens xsi:type="xtext:Assignment" feature="leftUri" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </groups> @@ -203,7 +204,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="uri"/> <abstractTokens xsi:type="xtext:Assignment" feature="rightUri" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </groups> @@ -236,7 +237,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="object"/> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -247,7 +248,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedResource"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="leftFrag" operator="="> @@ -265,7 +266,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedResource"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -280,7 +281,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedResource"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -348,7 +349,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> @@ -379,7 +380,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> @@ -426,7 +427,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> @@ -449,7 +450,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="="/> @@ -482,7 +483,7 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </groups> <groups xsi:type="xtext:Group"> @@ -491,7 +492,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedObject"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -499,7 +500,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="refFeature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -508,7 +509,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -527,7 +528,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="impFrag" operator="="> @@ -544,7 +545,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="index" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value=":"/> @@ -558,7 +559,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -566,7 +567,7 @@ </groups> <groups xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </groups> </groups> @@ -576,7 +577,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedObject"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -584,7 +585,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="refFeature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -593,7 +594,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -612,7 +613,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="impFrag" operator="="> @@ -635,7 +636,7 @@ </groups> <groups xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </groups> </groups> @@ -645,7 +646,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedObject"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -653,7 +654,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="refFeature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -662,7 +663,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="refIndex" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -681,7 +682,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="impFrag" operator="="> @@ -702,7 +703,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -739,7 +740,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//Import"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -760,7 +761,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#//NamedResource"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -771,7 +772,7 @@ </rules> <rules xsi:type="xtext:LexerRule" name="FRAGMENT" body="'#' ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'/'|'['|']'|'{'|'}'|'.'|'@')+"> <type> - <metamodel href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@metamodelDeclarations.0"/> + <metamodel href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@metamodelDeclarations.0"/> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> </rules> @@ -824,7 +825,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="java"/> <abstractTokens xsi:type="xtext:Assignment" feature="method" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -839,7 +840,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="exprstr" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </alternatives> </rules> 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 69f7ed7..20c5d93 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 @@ -32,6 +32,7 @@ public final class EpatchTestLanguageAssignmentConsumer extends NonTerminalConsu super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 4bca95e..48f95d0 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 @@ -61,6 +61,7 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal ruleCall$28$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 8beb4d9..79e776c 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 @@ -52,6 +52,7 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 ce884f8..bf1ac3e 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 @@ -40,6 +40,7 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 9b6caee..2d2d78f 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 @@ -45,6 +45,7 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java index a31f16a..5e3565c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java @@ -40,6 +40,7 @@ public final class EpatchTestLanguageEPackageImportConsumer extends NonTerminalC ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4eb1ba5..2b30568 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 @@ -44,6 +44,7 @@ public final class EpatchTestLanguageEPatchConsumer extends NonTerminalConsumer ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 5fcead7..a7ca7c3 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 @@ -28,6 +28,7 @@ public final class EpatchTestLanguageExecutableConsumer extends NonTerminalConsu super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java index 5b90033..149d132 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java @@ -29,6 +29,7 @@ public final class EpatchTestLanguageExpressionExecutableConsumer extends NonTer ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java index 6c13815..c5875a0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java @@ -41,6 +41,7 @@ public final class EpatchTestLanguageExtensionImportConsumer extends NonTerminal ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 79147c8..1554bee 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 @@ -30,6 +30,7 @@ public final class EpatchTestLanguageImportConsumer extends NonTerminalConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java index b498cab..a652646 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java @@ -38,6 +38,7 @@ public final class EpatchTestLanguageJavaExecutableConsumer extends NonTerminalC ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java index dec0c64..e51d9d9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java @@ -41,6 +41,7 @@ public final class EpatchTestLanguageJavaImportConsumer extends NonTerminalConsu ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 8d8fd3a..fdd5b63 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 @@ -76,6 +76,7 @@ public final class EpatchTestLanguageListAssignmentValueConsumer extends NonTerm ruleCall$40$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 d48f10d..a62886a 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 @@ -38,6 +38,7 @@ public final class EpatchTestLanguageMigrationConsumer extends NonTerminalConsum keyword$16$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 47d078a..3950d27 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 @@ -28,6 +28,7 @@ public final class EpatchTestLanguageModelImportConsumer extends NonTerminalCons super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 db791f3..60918f9 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 @@ -46,6 +46,7 @@ public final class EpatchTestLanguageMonoListAssignmentConsumer extends NonTermi ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 97abc7a..b90b25f 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 @@ -37,6 +37,7 @@ public final class EpatchTestLanguageMonoSingleAssignmentConsumer extends NonTer ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 80ea7c8..975372b 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 @@ -28,6 +28,7 @@ public final class EpatchTestLanguageNamedObjectConsumer extends NonTerminalCons super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 909ff69..40b78d2 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 @@ -66,6 +66,7 @@ public final class EpatchTestLanguageNamedResourceConsumer extends NonTerminalCo ruleCall$12$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java index 12c6370..a61f8dd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java @@ -37,6 +37,7 @@ public final class EpatchTestLanguageObjectCopyConsumer extends NonTerminalConsu ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java index b045f9b..5b173b4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java @@ -37,6 +37,7 @@ public final class EpatchTestLanguageObjectNewConsumer extends NonTerminalConsum ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 2751cae..51d19a9 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 @@ -76,6 +76,7 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum ruleCall$30$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java index 7a8d009..616e3df 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java @@ -40,6 +40,7 @@ public final class EpatchTestLanguageResourceImportConsumer extends NonTerminalC ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 9e3d907..2c7270b 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 @@ -64,6 +64,7 @@ public final class EpatchTestLanguageSingleAssignmentValueConsumer extends NonTe ruleCall$31$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi index 0532a32..b90047b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.keywords.KeywordsTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="KeywordsTestLanguage"> <ePackage href="http://www.eclipse.org/2009/tmf/xtext/KeywordsTestLanguage#/"/> </metamodelDeclarations> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java index df4cde7..84ab802 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java @@ -36,6 +36,7 @@ public final class KeywordsTestLanguageModelConsumer extends NonTerminalConsumer keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 5acaaaf..820d0ec 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 @@ -28,6 +28,7 @@ public final class XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 8e6ffa1..cdad1e7 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 @@ -28,6 +28,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 bdd0c66..47a0f25 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 @@ -30,6 +30,7 @@ public final class XtextGrammarTestLanguageAbstractRuleConsumer extends NonTermi super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 884a051..11de275 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 @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageAbstractTerminalConsumer extends NonT super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 3b4b885..5e175de 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 @@ -39,6 +39,7 @@ public final class XtextGrammarTestLanguageAbstractTokenConsumer extends NonTerm keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 f3c0579..90f4340 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 @@ -55,6 +55,7 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon ruleCall$16$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 2a881e7..b47dbd7 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 @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 300b2be..c880c94 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 @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageAssignmentConsumer extends NonTermina ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 0d3b99d..7525915 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 @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 15ffa14..5968976 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 @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java index 1c824b1..e0a5eea 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java @@ -43,6 +43,7 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 33219e4..209beda 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 @@ -75,6 +75,7 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo ruleCall$25$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 f348532..004c47e 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 @@ -26,6 +26,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java index 98a3f79..cc53aa1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageKeywordConsumer extends NonTerminalCo ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 44ac166..d357583 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 @@ -51,6 +51,7 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 e756312..479d62c 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 @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageNegatedTokenConsumer extends NonTermi keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 411fcef..48675fc 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 @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageParenthesizedElementConsumer extends keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 559d27a..897a0c7 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 @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageParenthesizedTerminalElementConsumer keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 cd3f2e0..1194b18 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 @@ -60,6 +60,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java index 7e629af..a59f0bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java index a3e7596..7b4b6d8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageRuleCallConsumer extends NonTerminalC crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 9284c38..056c44e 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 @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 173d45e..92d7656 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 @@ -26,6 +26,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 7af1dd4..a489edb 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 @@ -45,6 +45,7 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 9fbc740..b3edd1d 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 @@ -35,6 +35,7 @@ public final class XtextGrammarTestLanguageTerminalTokenConsumer extends NonTerm keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 5557b95..c9abc2e 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 @@ -34,6 +34,7 @@ public final class XtextGrammarTestLanguageTerminalTokenElementConsumer extends super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java index 7f9261d..4bb386e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java @@ -35,6 +35,7 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 c1a495a..47dc5f4 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 @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index 1b0f1c3..bb344ad 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -27,6 +27,7 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 33e9af0..699ec62 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.HiddenTerminalsTestLanguage" superGrammarName="NULL"> +<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.HiddenTerminalsTestLanguage"> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi index a796ecb..030cc86 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage" superGrammarName="NULL"> +<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage"> <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> 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 e260f25..8a0f7b9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore @@ -14,10 +14,10 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1" eType="//AbstractRule" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractRule"> + <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi index 64a5121..95711b7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.XtextTerminalsTestLanguage" superGrammarName="NULL" definesHiddenTokens="true" hiddenTokens="//@rules.34 //@rules.32 //@rules.33"> +<xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.terminalrules.XtextTerminalsTestLanguage" definesHiddenTokens="true" hiddenTokens="//@rules.34 //@rules.32 //@rules.33"> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="XtextTerminalsTestLanguage"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/XtextTerminalsTestLanguage#/"/> </metamodelDeclarations> 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 index a326be5..730a2f6 100644 --- 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 @@ -29,6 +29,7 @@ public final class HiddenTerminalsTestLanguageDatatypeHiddensConsumer extends No keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 index 957a3a1..575cdfe 100644 --- 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 @@ -30,6 +30,7 @@ public final class HiddenTerminalsTestLanguageDatatypeRuleConsumer extends NonTe keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 add5c9c..f5560ec 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 @@ -34,6 +34,7 @@ public final class HiddenTerminalsTestLanguageHidingHiddensConsumer extends NonT ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java index 2313a54..38246b4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java @@ -30,6 +30,7 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensCallConsumer exte keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 ec85676..8a2ac7b 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 @@ -43,6 +43,7 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensConsumer extends keyword$16$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 f5ee56b..3856162 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 @@ -34,6 +34,7 @@ public final class HiddenTerminalsTestLanguageModelConsumer extends NonTerminalC super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java index 4c6265b..b903f87 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java @@ -35,6 +35,7 @@ public final class HiddenTerminalsTestLanguageOverridingHiddensCallConsumer exte ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 aaf1f61..ca76292 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 @@ -41,6 +41,7 @@ public final class HiddenTerminalsTestLanguageOverridingHiddensConsumer extends keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java index de36deb..9590974 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java @@ -33,6 +33,7 @@ public final class HiddenTerminalsTestLanguageWithHiddensConsumer extends NonTer keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java index 30f7a30..d7f129a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java @@ -41,6 +41,7 @@ public final class HiddenTerminalsTestLanguageWithoutHiddensConsumer extends Non ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java index 6638d7d..41cc242 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java @@ -59,6 +59,7 @@ public final class TerminalRulesTestLanguageModelConsumer extends NonTerminalCon ruleCall$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 ef3ba41..81f7aeb 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 @@ -28,6 +28,7 @@ public final class XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsume super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 07eb153..9171f5c 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 @@ -28,6 +28,7 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 c5505d1..59ae4ef 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 @@ -30,6 +30,7 @@ public final class XtextTerminalsTestLanguageAbstractRuleConsumer extends NonTer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 1f26172..d90fdb6 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 @@ -32,6 +32,7 @@ public final class XtextTerminalsTestLanguageAbstractTerminalConsumer extends No super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 c23dd02..27b88eb 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 @@ -39,6 +39,7 @@ public final class XtextTerminalsTestLanguageAbstractTokenConsumer extends NonTe keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6ee126a..57ae4b0 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 @@ -55,6 +55,7 @@ public final class XtextTerminalsTestLanguageActionConsumer extends NonTerminalC ruleCall$16$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 e6c4314..88fe5d1 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 @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 7a06bd7..f9179e8 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 @@ -40,6 +40,7 @@ public final class XtextTerminalsTestLanguageAssignmentConsumer extends NonTermi ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 15272e9..729ea27 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 @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 e9ac40b..da35e55 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 @@ -40,6 +40,7 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java index b4976c6..1377229 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java @@ -43,6 +43,7 @@ public final class XtextTerminalsTestLanguageGeneratedMetamodelConsumer extends ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 ddf0aa5..fab93d3 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 @@ -57,6 +57,7 @@ public final class XtextTerminalsTestLanguageGrammarConsumer extends NonTerminal ruleCall$24$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 724953f..0e69c56 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 @@ -26,6 +26,7 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java index f360abe..2d11af9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageKeywordConsumer extends NonTerminal ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 af1af88..82ab328 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 @@ -51,6 +51,7 @@ public final class XtextTerminalsTestLanguageLexerRuleConsumer extends NonTermin ruleCall$17$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 0e66327..56e941d 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 @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageNegatedTokenConsumer extends NonTer keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 1b2dc01..c208098 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 @@ -32,6 +32,7 @@ public final class XtextTerminalsTestLanguageParenthesizedElementConsumer extend keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 0ac2574..b1f622f 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 @@ -32,6 +32,7 @@ public final class XtextTerminalsTestLanguageParenthesizedTerminalElementConsume keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 a4575bb..d64e760 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 @@ -60,6 +60,7 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java index c7d1f21..83fdc42 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java @@ -40,6 +40,7 @@ public final class XtextTerminalsTestLanguageReferencedMetamodelConsumer extends ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java index 2b87b50..7072702 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageRuleCallConsumer extends NonTermina crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 3a0512d..b789006 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 @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 33f161e..6a41b41 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 @@ -26,6 +26,7 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 e8709fe..4ac231b 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 @@ -45,6 +45,7 @@ public final class XtextTerminalsTestLanguageTerminalRuleConsumer extends NonTer ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4538c6b..f40e299 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 @@ -35,6 +35,7 @@ public final class XtextTerminalsTestLanguageTerminalTokenConsumer extends NonTe keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6ac1f7e..945805f 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 @@ -34,6 +34,7 @@ public final class XtextTerminalsTestLanguageTerminalTokenElementConsumer extend super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java index 96cf790..21ea28e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java @@ -35,6 +35,7 @@ public final class XtextTerminalsTestLanguageTypeRefConsumer extends NonTerminal keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 f2c74b9..c3142c1 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 @@ -29,6 +29,7 @@ public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTermin keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java index 7fc21f6..9349692 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java @@ -27,6 +27,7 @@ public final class XtextTerminalsTestLanguageWildcardConsumer extends NonTermina keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi index c73c2d9..0476603 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="formattertestlanguage"> <ePackage href="http://simple/formattertestlanguage#/"/> </metamodelDeclarations> @@ -23,12 +24,12 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java index 767a31c..d8fc81d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java @@ -35,6 +35,7 @@ public final class FormatterTestLanguageLineConsumer extends NonTerminalConsumer ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 d82847c..b6a82df 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 @@ -31,6 +31,7 @@ public final class FormatterTestLanguageRootConsumer extends NonTerminalConsumer keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 36eca4a..81eaa6a 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 @@ -37,6 +37,7 @@ public final class FormatterTestLanguageTestIndentationConsumer extends NonTermi keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 d43982b..d448c2a 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 @@ -29,6 +29,7 @@ public final class FormatterTestLanguageTestLinewrapConsumer extends NonTerminal keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi index 8b3e6c1..ae5bfe1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parsetree.reconstr.ComplexReconstrTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="complexrewritetest"> <ePackage href="http://complex/rewrite/test#/"/> </metamodelDeclarations> @@ -63,7 +64,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> @@ -97,7 +98,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -122,7 +123,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -133,7 +134,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> @@ -147,19 +148,19 @@ <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </alternatives> @@ -175,7 +176,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="TC"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -219,18 +220,18 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="foo" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -238,19 +239,19 @@ <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -267,18 +268,18 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="foo" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -288,12 +289,12 @@ <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -309,12 +310,12 @@ <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -322,12 +323,12 @@ <abstractTokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Assignment" feature="name" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </groups> <groups xsi:type="xtext:Assignment" feature="type" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </groups> </abstractTokens> @@ -374,7 +375,7 @@ <groups xsi:type="xtext:RuleCall" rule="//@rules.13"/> <groups xsi:type="xtext:Assignment" feature="val" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </groups> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi index fc97ef6..a860f16 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parsetree.reconstr.SimpleReconstrTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simplerewritetest"> <ePackage href="http://simple/rewrite/test#/"/> </metamodelDeclarations> @@ -54,7 +55,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> @@ -83,12 +84,12 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="num1" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="num2" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -96,7 +97,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="#"/> <abstractTokens xsi:type="xtext:Assignment" feature="num3" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -111,13 +112,13 @@ <abstractTokens xsi:type="xtext:Keyword" value="="/> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="str1" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="str2" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </alternatives> @@ -132,7 +133,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="type"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -143,7 +144,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://simple/rewrite/test#//Type"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -159,7 +160,7 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="mykeyword1"/> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> </groups> <groups xsi:type="xtext:Keyword" value="mykeyword2"/> @@ -176,7 +177,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="#3"/> <abstractTokens xsi:type="xtext:Assignment" feature="id" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -184,7 +185,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="id" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -206,7 +207,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageAtomConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageAtomConsumer.java index 90f100a..14c087e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageAtomConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageAtomConsumer.java @@ -29,6 +29,7 @@ public final class ComplexReconstrTestLanguageAtomConsumer extends NonTerminalCo ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 92b0edb..b6120c7 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 @@ -32,6 +32,7 @@ public final class ComplexReconstrTestLanguageOpConsumer extends NonTerminalCons keyword$15$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 25adb8e..dbdcd46 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 @@ -35,6 +35,7 @@ public final class ComplexReconstrTestLanguageParensConsumer extends NonTerminal keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 26c5985..85e1f89 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 @@ -28,6 +28,7 @@ public final class ComplexReconstrTestLanguageRootConsumer extends NonTerminalCo super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 bb45f1c..bffbe15 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 @@ -28,6 +28,7 @@ public final class ComplexReconstrTestLanguageTermConsumer extends NonTerminalCo super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyA1Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyA1Consumer.java index a344a20..9fbfd9e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyA1Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyA1Consumer.java @@ -29,6 +29,7 @@ public final class ComplexReconstrTestLanguageTrickyA1Consumer extends NonTermin ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 893ec82..cb84be1 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 @@ -45,6 +45,7 @@ public final class ComplexReconstrTestLanguageTrickyAConsumer extends NonTermina ruleCall$19$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java index 6a9f824..f62ddc4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java @@ -40,6 +40,7 @@ public final class ComplexReconstrTestLanguageTrickyBConsumer extends NonTermina ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java index ddd0db9..8b4da11 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java @@ -41,6 +41,7 @@ public final class ComplexReconstrTestLanguageTrickyCConsumer extends NonTermina ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java index ca8f1e6..0daf334 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java @@ -51,6 +51,7 @@ public final class ComplexReconstrTestLanguageTrickyDConsumer extends NonTermina ruleCall$19$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java index 5ca25c1..bcc149a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java @@ -51,6 +51,7 @@ public final class ComplexReconstrTestLanguageTrickyEConsumer extends NonTermina ruleCall$18$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java index b720a63..8c9d3e1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java @@ -43,6 +43,7 @@ public final class ComplexReconstrTestLanguageTrickyFConsumer extends NonTermina ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 b6c6436..97fdc52 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 @@ -35,6 +35,7 @@ public final class ComplexReconstrTestLanguageTrickyG1Consumer extends NonTermin keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 af98601..5a58a25 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 @@ -31,6 +31,7 @@ public final class ComplexReconstrTestLanguageTrickyG2Consumer extends NonTermin ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 2530cb1..1779b7d 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 @@ -29,6 +29,7 @@ public final class ComplexReconstrTestLanguageTrickyGConsumer extends NonTermina keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageAtomConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageAtomConsumer.java index d45b9f5..d8abefa 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageAtomConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageAtomConsumer.java @@ -29,6 +29,7 @@ public final class SimpleReconstrTestLanguageAtomConsumer extends NonTerminalCon ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java index 1d47832..73db7a4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java @@ -38,6 +38,7 @@ public final class SimpleReconstrTestLanguageBooleanConsumer extends NonTerminal ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java index 45c4d53..3df8182 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java @@ -35,6 +35,7 @@ public final class SimpleReconstrTestLanguageManyStringsConsumer extends NonTerm ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6b00e32..809a43d 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 @@ -26,6 +26,7 @@ public final class SimpleReconstrTestLanguageOpConsumer extends NonTerminalConsu super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 09c81b9..9d3081a 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 @@ -35,6 +35,7 @@ public final class SimpleReconstrTestLanguageParensConsumer extends NonTerminalC keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java index fe76552..ca7e25b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java @@ -38,6 +38,7 @@ public final class SimpleReconstrTestLanguageRef2Consumer extends NonTerminalCon ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java index 038e3cb..fcd5b6e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java @@ -38,6 +38,7 @@ public final class SimpleReconstrTestLanguageSpareConsumer extends NonTerminalCo ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 ac10f27..1e6f66c 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 @@ -40,6 +40,7 @@ public final class SimpleReconstrTestLanguageTermConsumer extends NonTerminalCon super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java index 16242bb..842905b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java @@ -38,6 +38,7 @@ public final class SimpleReconstrTestLanguageTwoNumbersConsumer extends NonTermi ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java index d54777f..e482c79 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java @@ -38,6 +38,7 @@ public final class SimpleReconstrTestLanguageTypeConsumer extends NonTerminalCon ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi index 1884901..eb321b7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parsetree.transientvalues.TransientValuesTest"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="transientvaluestest"> <ePackage href="http://simple/transientvaluestest#/"/> </metamodelDeclarations> @@ -27,13 +28,13 @@ <abstractTokens xsi:type="xtext:Keyword" value="required"/> <abstractTokens xsi:type="xtext:Assignment" feature="required1" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="required2" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </alternatives> @@ -47,7 +48,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="optional"/> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="opt1" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -55,7 +56,7 @@ <abstractTokens xsi:type="xtext:Keyword" value=":"/> <abstractTokens xsi:type="xtext:Assignment" feature="opt2" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -69,7 +70,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="list"/> <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="item" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </alternatives> 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 ff7297a..82b5ec4 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 @@ -33,6 +33,7 @@ public final class TransientValuesTestRootConsumer extends NonTerminalConsumer { keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java index a2eb2c3..150d3ac 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java @@ -32,6 +32,7 @@ public final class TransientValuesTestTestListConsumer extends NonTerminalConsum ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java index 219690f..4fd976d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java @@ -38,6 +38,7 @@ public final class TransientValuesTestTestOptionalConsumer extends NonTerminalCo ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java index 49fc5f6..aab475a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java @@ -35,6 +35,7 @@ public final class TransientValuesTestTestRequiredConsumer extends NonTerminalCo ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi index 0a2323d..44444b6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.resource.metamodel.MultiValueFeatureTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="MultiValueFeatureTestLanguage"> <ePackage href="http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage#/"/> </metamodelDeclarations> @@ -9,7 +10,7 @@ </type> <alternatives xsi:type="xtext:Assignment" cardinality="+" feature="featureA" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/consumers/MultiValueFeatureTestLanguageStartConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/consumers/MultiValueFeatureTestLanguageStartConsumer.java index 1043310..531ac3d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/consumers/MultiValueFeatureTestLanguageStartConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/consumers/MultiValueFeatureTestLanguageStartConsumer.java @@ -29,6 +29,7 @@ public final class MultiValueFeatureTestLanguageStartConsumer extends NonTermina ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi index 880feb3..7b0b24b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.ActionTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ActionLang"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/ActionLang#/"/> </metamodelDeclarations> @@ -41,7 +42,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi index e34d5a4..b91d423 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.ContentAssistTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="contentAssistTestLanguage"> <ePackage href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#/"/> </metamodelDeclarations> @@ -36,7 +37,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="("/> @@ -60,7 +61,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="rule"/> @@ -83,7 +84,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi index db7d6ae..036e5b5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.FowlerDslTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl"> <ePackage href="http://example.xtext.org/FowlerDslTestLanguage#/"/> </metamodelDeclarations> @@ -44,13 +45,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="code" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -62,12 +63,12 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="code" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -83,7 +84,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="state"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -98,7 +99,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDslTestLanguage#//Command"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -123,7 +124,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDslTestLanguage#//Event"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="=>"/> @@ -133,7 +134,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDslTestLanguage#//State"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi index ec31919..15637b5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.LexerTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LexerLang"> <ePackage href="http://www.eclipse.org/2008/xtext/LexerLang#/"/> </metamodelDeclarations> @@ -18,7 +19,7 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="h" operator="="> @@ -28,7 +29,7 @@ </rules> <rules xsi:type="xtext:LexerRule" name="STRING" body=" '#' ('B')+ "> <type> - <metamodel href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@metamodelDeclarations.0"/> + <metamodel href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@metamodelDeclarations.0"/> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi index b9dfe47..66052e3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.LookaheadTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LookaheadLang"> <ePackage href="http://www.eclipse.org/2008/xtext/LookaheadLang#/"/> </metamodelDeclarations> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi index a01866f..0385809 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.OptionalEmptyTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="OptionalEmpty"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/OptionalEmpty#/"/> </metamodelDeclarations> @@ -19,7 +20,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="hallo"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi index 04987a2..e7bddfc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.PartialParserTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="partialParserTestLanguage"> <ePackage href="http://example.xtext.org/PartialParserTestLanguage#/"/> </metamodelDeclarations> @@ -14,7 +15,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="container"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -152,7 +153,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/PartialParserTestLanguage#//Container"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -185,7 +186,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://example.xtext.org/PartialParserTestLanguage#//Child"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -198,7 +199,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index bd572c8..95c0c0a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar"> <ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/> </metamodelDeclarations> @@ -15,13 +16,13 @@ <abstractTokens xsi:type="xtext:Keyword" value="spielplatz"/> <abstractTokens xsi:type="xtext:Assignment" feature="groesse" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="beschreibung" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -71,13 +72,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -97,13 +98,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -123,7 +124,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -168,11 +169,11 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="keyword"/> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> </groups> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </groups> </terminal> </abstractTokens> @@ -182,7 +183,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -191,7 +192,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -200,7 +201,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -211,7 +212,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi index 92af60b..05be826 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simpleExpressions"> <ePackage href="http://www.eclipse.org/xtext/test/simpleExpressions#/"/> </metamodelDeclarations> @@ -88,7 +89,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi index 52c7860..5c587b8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.TestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TestLang"> <ePackage href="http://www.eclipse.org/2008/xtext/TestLang#/"/> </metamodelDeclarations> @@ -33,7 +34,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -65,7 +66,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="stringFeature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi index f1c7fd8..e0bd7b5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.TreeTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TreeTestLanguage"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage#/"/> </metamodelDeclarations> @@ -23,14 +24,14 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="("/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="attrib" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> 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 707e072..2ceb26c 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 @@ -26,6 +26,7 @@ public final class ActionTestLanguageElementConsumer extends NonTerminalConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java index b970476..4ec32cd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java @@ -29,6 +29,7 @@ public final class ActionTestLanguageItemConsumer extends NonTerminalConsumer { ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 a4bb1cd..596629d 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 @@ -26,6 +26,7 @@ public final class ActionTestLanguageModelConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java index 6a3ad07..27f619d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java @@ -29,6 +29,7 @@ public final class ContentAssistTestLanguageAbstractRuleCallConsumer extends Non crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 dee2ac3..a197b83 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 @@ -28,6 +28,7 @@ public final class ContentAssistTestLanguageAbstractRuleConsumer extends NonTerm super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 70d52ae..f1a86fa 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 @@ -40,6 +40,7 @@ public final class ContentAssistTestLanguageFirstAbstractRuleChildConsumer exten ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 ab2a094..653854d 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 @@ -40,6 +40,7 @@ public final class ContentAssistTestLanguageSecondAbstractRuleChildConsumer exte ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 9a186f6..0916e45 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 @@ -32,6 +32,7 @@ public final class ContentAssistTestLanguageStartConsumer extends NonTerminalCon keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java index f26fa66..2c46df0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java @@ -32,6 +32,7 @@ public final class FowlerDslTestLanguageCommandConsumer extends NonTerminalConsu ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java index 5bd3dbf..1a7d139 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java @@ -35,6 +35,7 @@ public final class FowlerDslTestLanguageEventConsumer extends NonTerminalConsume ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 8895ecf..07640eb 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 @@ -49,6 +49,7 @@ public final class FowlerDslTestLanguageStateConsumer extends NonTerminalConsume ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 5c3779b..7739303 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 @@ -42,6 +42,7 @@ public final class FowlerDslTestLanguageStatemachineConsumer extends NonTerminal keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java index 2fe09c5..7e22340 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java @@ -35,6 +35,7 @@ public final class FowlerDslTestLanguageTransitionConsumer extends NonTerminalCo keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java index 238d016..595cbe9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java @@ -34,6 +34,7 @@ public final class LexerTestLanguageElementConsumer extends NonTerminalConsumer ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 c53377b..b04305e 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 @@ -26,6 +26,7 @@ public final class LexerTestLanguageModelConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 c7fea42..ece1680 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 @@ -30,6 +30,7 @@ public final class LookaheadTestLanguageAltsConsumer extends NonTerminalConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 1d985b7..4ef27b4 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 @@ -26,6 +26,7 @@ public final class LookaheadTestLanguageEntryConsumer extends NonTerminalConsume super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead0Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead0Consumer.java index cb22efe..327b9e7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead0Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead0Consumer.java @@ -30,6 +30,7 @@ public final class LookaheadTestLanguageLookAhead0Consumer extends NonTerminalCo keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 8722640..ecbf2ca 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 @@ -35,6 +35,7 @@ public final class LookaheadTestLanguageLookAhead1Consumer extends NonTerminalCo keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead2Consumer.java index 04b009e..c465739 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead2Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead2Consumer.java @@ -33,6 +33,7 @@ public final class LookaheadTestLanguageLookAhead2Consumer extends NonTerminalCo keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6e9bd65..af42880 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 @@ -35,6 +35,7 @@ public final class LookaheadTestLanguageLookAhead3Consumer extends NonTerminalCo keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead4Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead4Consumer.java index 322549b..097e91d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead4Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead4Consumer.java @@ -30,6 +30,7 @@ public final class LookaheadTestLanguageLookAhead4Consumer extends NonTerminalCo keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java index c496c4a..c718b6c5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java @@ -32,6 +32,7 @@ public final class OptionalEmptyTestLanguageGreetingConsumer extends NonTerminal ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 030f5c6..8828671 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 @@ -26,6 +26,7 @@ public final class OptionalEmptyTestLanguageModelConsumer extends NonTerminalCon super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 b8fd5e9..c4e4274 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 @@ -28,6 +28,7 @@ public final class PartialParserTestLanguageAbstractChildConsumer extends NonTer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 815a8bb..666559b 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 @@ -35,6 +35,7 @@ public final class PartialParserTestLanguageAbstractChildrenConsumer extends Non keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 eac4769..2e9d30d 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 @@ -38,6 +38,7 @@ public final class PartialParserTestLanguageChildConsumer extends NonTerminalCon keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 5432fbc..cf7f4b7 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 @@ -38,6 +38,7 @@ public final class PartialParserTestLanguageChildrenConsumer extends NonTerminal keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 c1ecb5d..f493717 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 @@ -42,6 +42,7 @@ public final class PartialParserTestLanguageContainerConsumer extends NonTermina ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 4c0e431..19ff58a 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 @@ -28,6 +28,7 @@ public final class PartialParserTestLanguageContentConsumer extends NonTerminalC super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 e1a865a..3c9bfcd 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 @@ -43,6 +43,7 @@ public final class PartialParserTestLanguageFirstConcreteConsumer extends NonTer keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNamedConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNamedConsumer.java index 39b836d..9be70db 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNamedConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNamedConsumer.java @@ -29,6 +29,7 @@ public final class PartialParserTestLanguageNamedConsumer extends NonTerminalCon ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 b277ee2..1b4ce20 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 @@ -35,6 +35,7 @@ public final class PartialParserTestLanguageNestedConsumer extends NonTerminalCo keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 a930143..71767c0 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 @@ -46,6 +46,7 @@ public final class PartialParserTestLanguageSecondConcreteConsumer extends NonTe keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java index 4e28b18..634e6fd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java @@ -43,6 +43,7 @@ public final class ReferenceGrammarTestLanguageErwachsenerConsumer extends NonTe ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java index e0a65f1..e94863a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java @@ -61,6 +61,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin ruleCall$15$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java index 4cce205..5f88bfe 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java @@ -36,6 +36,7 @@ public final class ReferenceGrammarTestLanguageFarbeConsumer extends NonTerminal keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java index 6b26bea..a520339 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java @@ -43,6 +43,7 @@ public final class ReferenceGrammarTestLanguageKindConsumer extends NonTerminalC ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 babfdbc..0d3b624 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 @@ -28,6 +28,7 @@ public final class ReferenceGrammarTestLanguagePersonConsumer extends NonTermina super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 f777734..7195c06 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 @@ -51,6 +51,7 @@ public final class ReferenceGrammarTestLanguageSpielplatzConsumer extends NonTer ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6d6bc6a..27b0bb2 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 @@ -40,6 +40,7 @@ public final class ReferenceGrammarTestLanguageSpielzeugConsumer extends NonTerm ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 9f6a4b9..5e1b0f3 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 @@ -32,6 +32,7 @@ public final class SimpleExpressionsTestLanguageAdditionConsumer extends NonTerm keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAtomConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAtomConsumer.java index d8854e0..3f09fd5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAtomConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAtomConsumer.java @@ -29,6 +29,7 @@ public final class SimpleExpressionsTestLanguageAtomConsumer extends NonTerminal ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 8525835..2fc88b7 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 @@ -32,6 +32,7 @@ public final class SimpleExpressionsTestLanguageMultiplicationConsumer extends N keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 e3987c0..43e3251 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 @@ -32,6 +32,7 @@ public final class SimpleExpressionsTestLanguageParensConsumer extends NonTermin keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 3c3cf27..bafc2cf 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 @@ -26,6 +26,7 @@ public final class SimpleExpressionsTestLanguageSequenceConsumer extends NonTerm super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 d7f704f..18e74ec 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 @@ -28,6 +28,7 @@ public final class SimpleExpressionsTestLanguageTermConsumer extends NonTerminal super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } 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 2cf3471..ba961ac 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 @@ -28,6 +28,7 @@ public final class TestLanguageAbstractRuleConsumer extends NonTerminalConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java index c5bb3c2..209f2b2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java @@ -35,6 +35,7 @@ public final class TestLanguageChoiceRuleConsumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } 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 6535e14..6fddabc 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 @@ -26,6 +26,7 @@ public final class TestLanguageEntryRuleConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 a867a3d..7ed6451 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 @@ -29,6 +29,7 @@ public final class TestLanguageReducibleRuleConsumer extends NonTerminalConsumer keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageTerminalRuleConsumer.java index 535b5a8..e590254 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageTerminalRuleConsumer.java @@ -29,6 +29,7 @@ public final class TestLanguageTerminalRuleConsumer extends NonTerminalConsumer ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 81e812b..bcd6a03 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 @@ -26,6 +26,7 @@ public final class TreeTestLanguageModelConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } 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 df29a43..7932645 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 @@ -48,6 +48,7 @@ public final class TreeTestLanguageNodeConsumer extends NonTerminalConsumer { ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi index 45d8647..4c18ece 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.valueconverter.Bug250313"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="bug250313"> <ePackage href="http://org.eclipse.xtext.valueconverter.Bug250313#/"/> </metamodelDeclarations> @@ -14,11 +15,11 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="mykeyword1"/> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> </groups> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </groups> </terminal> </abstractTokens> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Ref2Consumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Ref2Consumer.java index 72e08c3..2e6d549 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Ref2Consumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Ref2Consumer.java @@ -40,6 +40,7 @@ public final class Bug250313Ref2Consumer extends NonTerminalConsumer { ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java index 5c68de1..b45b84e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/AbstractParserComparingTest.java @@ -55,20 +55,24 @@ public abstract class AbstractParserComparingTest extends AbstractGeneratorTest for(Pair<String, String> pair: getAllModels()) { String model = pair.getSecond(); modelName.set(pair.getFirst() + "(" + getFirstParserName() + " / " + getSecondParserName() + ")"); - XtextResource firstResult = firstHelper.getResourceFromStream(new StringInputStream(model)); - XtextResource secondResult = secondHelper.getResourceFromStream(new StringInputStream(model)); - checkResource(pair.getFirst() + " - " + getFirstParserName(), firstResult); - checkResource(pair.getFirst() + " - " + getSecondParserName(), secondResult); - comparator.assertSameStructure(firstResult.getParseResult().getRootASTElement(), secondResult.getParseResult().getRootASTElement()); - comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode()); - - String firstNodeResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), getIgnoredFeatures()); - String secondNodeResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), getIgnoredFeatures()); - assertEquals(firstNodeResultAsString, secondNodeResultAsString); - - String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootASTElement()); - String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootASTElement()); - assertEquals(firstResultAsString, secondResultAsString); + try { + XtextResource firstResult = firstHelper.getResourceFromStream(new StringInputStream(model)); + XtextResource secondResult = secondHelper.getResourceFromStream(new StringInputStream(model)); + checkResource(pair.getFirst() + " - " + getFirstParserName(), firstResult); + checkResource(pair.getFirst() + " - " + getSecondParserName(), secondResult); + comparator.assertSameStructure(firstResult.getParseResult().getRootASTElement(), secondResult.getParseResult().getRootASTElement()); + comparator.assertSameStructure(firstResult.getParseResult().getRootNode(), secondResult.getParseResult().getRootNode()); + + String firstNodeResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootNode(), getIgnoredFeatures()); + String secondNodeResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootNode(), getIgnoredFeatures()); + assertEquals(firstNodeResultAsString, secondNodeResultAsString); + + String firstResultAsString = EmfFormater.objToStr(firstResult.getParseResult().getRootASTElement()); + String secondResultAsString = EmfFormater.objToStr(secondResult.getParseResult().getRootASTElement()); + assertEquals(firstResultAsString, secondResultAsString); + } catch (Exception e) { + throw new RuntimeException(modelName.get(), e); + } } } diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi index efa2643..ffc7cfd 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi +++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.ui.integration.TestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="foo"> <ePackage href="http://foo#/"/> </metamodelDeclarations> @@ -19,7 +20,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="stuff"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> 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 ef490c2..7a9fdda 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 @@ -26,6 +26,7 @@ public final class TestLanguageFileConsumer extends NonTerminalConsumer { super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageStuffConsumer.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageStuffConsumer.java index 059f701..39303ff 100644 --- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageStuffConsumer.java +++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageStuffConsumer.java @@ -32,6 +32,7 @@ public final class TestLanguageStuffConsumer extends NonTerminalConsumer { ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/.settings/org.eclipse.xtend.shared.ui.prefs b/tests/org.eclipse.xtext.xtend.tests/.settings/org.eclipse.xtend.shared.ui.prefs new file mode 100644 index 0000000..77bec5f --- a/dev/null +++ b/tests/org.eclipse.xtext.xtend.tests/.settings/org.eclipse.xtend.shared.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +metamodelContributor=org.eclipse.xtend.typesystem.emf.ui.EmfMetamodelContributor,org.eclipse.xtend.shared.ui.core.metamodel.jdt.javabean.JavaBeanMetamodelContributor +project.specific.metamodel=true 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 0dc9c7b..1bf6af0 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,10 +17,16 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_hiddenTokens(Grammar this): - allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this): + allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_hiddenTokens(emf::EObject this) : +List[IScopedElement] scope_ePackage(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_metamodel(TypeRef this): + allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_metamodel(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_rule(RuleCall this): @@ -29,10 +35,10 @@ List[IScopedElement] scope_rule(RuleCall this): 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)); +List[IScopedElement] scope_hiddenTokens(Grammar this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_ePackage(emf::EObject this) : +List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_hiddenTokens(ParserRule this): @@ -41,10 +47,10 @@ List[IScopedElement] scope_hiddenTokens(ParserRule this): List[IScopedElement] scope_hiddenTokens(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_metamodel(TypeRef this): - allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_rule(CrossReference this): + allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x)); -List[IScopedElement] scope_metamodel(emf::EObject this) : +List[IScopedElement] scope_rule(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_type(TypeRef this): @@ -53,9 +59,3 @@ List[IScopedElement] scope_type(TypeRef this): List[IScopedElement] scope_type(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)); - diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index baee6ce..aee9bcf 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.XtextGrammarTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="XtextTest"> <ePackage href="http://www.eclipse.org/2008/Test/XtextTest#/"/> </metamodelDeclarations> @@ -24,7 +25,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="idElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -32,7 +33,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="idElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -42,7 +43,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="extends"/> <abstractTokens xsi:type="xtext:Assignment" feature="superGrammarIdElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -50,7 +51,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="."/> <abstractTokens xsi:type="xtext:Assignment" feature="superGrammarIdElements" operator="+="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -70,7 +71,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> @@ -80,7 +81,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -129,7 +130,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="generate"/> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -138,7 +139,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -146,7 +147,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="as"/> <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -164,7 +165,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -172,7 +173,7 @@ <abstractTokens xsi:type="xtext:Keyword" value="as"/> <abstractTokens xsi:type="xtext:Assignment" feature="alias" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -193,7 +194,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -208,7 +209,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="body" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -226,7 +227,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -250,7 +251,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="*"> @@ -260,7 +261,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -292,7 +293,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -323,7 +324,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractMetamodelDeclaration"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="::"/> @@ -333,7 +334,7 @@ <type metamodel="//@metamodelDeclarations.1"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </alternatives> @@ -464,7 +465,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="operator" operator="="> @@ -507,7 +508,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="feature" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -635,7 +636,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -673,7 +674,7 @@ </type> <alternatives xsi:type="xtext:Assignment" feature="value" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </alternatives> </rules> @@ -686,7 +687,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi index 0532a32..b90047b 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.parser.keywords.KeywordsTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="KeywordsTestLanguage"> <ePackage href="http://www.eclipse.org/2009/tmf/xtext/KeywordsTestLanguage#/"/> </metamodelDeclarations> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java index df4cde7..84ab802 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/consumers/KeywordsTestLanguageModelConsumer.java @@ -36,6 +36,7 @@ public final class KeywordsTestLanguageModelConsumer extends NonTerminalConsumer keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java index 5acaaaf..820d0ec 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java @@ -28,6 +28,7 @@ public final class XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 8e6ffa1..cdad1e7 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -28,6 +28,7 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java index bdd0c66..47a0f25 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java @@ -30,6 +30,7 @@ public final class XtextGrammarTestLanguageAbstractRuleConsumer extends NonTermi super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java index 884a051..11de275 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageAbstractTerminalConsumer extends NonT super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java index 3b4b885..5e175de 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java @@ -39,6 +39,7 @@ public final class XtextGrammarTestLanguageAbstractTokenConsumer extends NonTerm keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java index f3c0579..90f4340 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java @@ -55,6 +55,7 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon ruleCall$16$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index 2a881e7..b47dbd7 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java index 300b2be..c880c94 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageAssignmentConsumer extends NonTermina ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index 0d3b99d..7525915 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java index 15ffa14..5968976 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java index 1c824b1..e0a5eea 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java @@ -43,6 +43,7 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java index 33219e4..209beda 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java @@ -75,6 +75,7 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo ruleCall$25$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index f348532..004c47e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -26,6 +26,7 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java index 98a3f79..cc53aa1 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageKeywordConsumer extends NonTerminalCo ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java index 44ac166..d357583 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java @@ -51,6 +51,7 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java index e756312..479d62c 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageNegatedTokenConsumer extends NonTermi keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java index 411fcef..48675fc 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageParenthesizedElementConsumer extends keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java index 559d27a..897a0c7 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java @@ -32,6 +32,7 @@ public final class XtextGrammarTestLanguageParenthesizedTerminalElementConsumer keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java index cd3f2e0..1194b18 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java @@ -60,6 +60,7 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java index 7e629af..a59f0bf 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java @@ -40,6 +40,7 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java index a3e7596..7b4b6d8 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageRuleCallConsumer extends NonTerminalC crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index 9284c38..056c44e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index 173d45e..92d7656 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -26,6 +26,7 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java index 7af1dd4..a489edb 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java @@ -45,6 +45,7 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java index 9fbc740..b3edd1d 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java @@ -35,6 +35,7 @@ public final class XtextGrammarTestLanguageTerminalTokenConsumer extends NonTerm keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java index 5557b95..c9abc2e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java @@ -34,6 +34,7 @@ public final class XtextGrammarTestLanguageTerminalTokenElementConsumer extends super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java index 7f9261d..4bb386e 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java @@ -35,6 +35,7 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java index c1a495a..47dc5f4 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java @@ -29,6 +29,7 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index 1b0f1c3..bb344ad 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -27,6 +27,7 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi index e34d5a4..b91d423 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.ContentAssistTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="contentAssistTestLanguage"> <ePackage href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#/"/> </metamodelDeclarations> @@ -36,7 +37,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="("/> @@ -60,7 +61,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="rule"/> @@ -83,7 +84,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#//AbstractRule"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </alternatives> </rules> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext index ccf439c..a2ae8fd 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext @@ -16,18 +16,18 @@ extension org::eclipse::xtend::util::stdlib::io; */ -List[IScopedElement] scope_mutter(Familie this): - allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); - -List[IScopedElement] scope_mutter(emf::EObject this) : - allElements().collect(x | createScopedElement(x.referenceName(), x)); - List[IScopedElement] scope_kinder(Familie this): allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x)); List[IScopedElement] scope_kinder(emf::EObject this) : allElements().collect(x | createScopedElement(x.referenceName(), x)); +List[IScopedElement] scope_mutter(Familie this): + allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); + +List[IScopedElement] scope_mutter(emf::EObject this) : + allElements().collect(x | createScopedElement(x.referenceName(), x)); + List[IScopedElement] scope_vater(Familie this): allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x)); diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi index bd572c8..95c0c0a 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar"> <ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/> </metamodelDeclarations> @@ -15,13 +16,13 @@ <abstractTokens xsi:type="xtext:Keyword" value="spielplatz"/> <abstractTokens xsi:type="xtext:Assignment" feature="groesse" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="beschreibung" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> @@ -71,13 +72,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -97,13 +98,13 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="age" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.1"/> </terminal> </abstractTokens> </abstractTokens> @@ -123,7 +124,7 @@ </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -168,11 +169,11 @@ <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Keyword" value="keyword"/> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </groups> </groups> <groups xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </groups> </terminal> </abstractTokens> @@ -182,7 +183,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -191,7 +192,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Erwachsener"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -200,7 +201,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> @@ -211,7 +212,7 @@ <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Kind"/> </type> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> </abstractTokens> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi index f1c7fd8..e0bd7b5 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ASCII"?> <xtext:Grammar xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.xtext.testlanguages.TreeTestLanguage"> + <superGrammar href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#/"/> <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TreeTestLanguage"> <ePackage href="http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage#/"/> </metamodelDeclarations> @@ -23,14 +24,14 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.0"/> </terminal> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="("/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="attrib" operator="="> <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xtext#//@rules.2"/> </terminal> </abstractTokens> </abstractTokens> diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java index 6a3ad07..27f619d 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleCallConsumer.java @@ -29,6 +29,7 @@ public final class ContentAssistTestLanguageAbstractRuleCallConsumer extends Non crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAssignment$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java index dee2ac3..a197b83 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageAbstractRuleConsumer.java @@ -28,6 +28,7 @@ public final class ContentAssistTestLanguageAbstractRuleConsumer extends NonTerm super(configuration, hiddenTokens); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java index 70d52ae..f1a86fa 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java @@ -40,6 +40,7 @@ public final class ContentAssistTestLanguageFirstAbstractRuleChildConsumer exten ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java index ab2a094..653854d 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java @@ -40,6 +40,7 @@ public final class ContentAssistTestLanguageSecondAbstractRuleChildConsumer exte ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java index 9a186f6..0916e45 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java @@ -32,6 +32,7 @@ public final class ContentAssistTestLanguageStartConsumer extends NonTerminalCon keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java index 4e28b18..634e6fd 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java @@ -43,6 +43,7 @@ public final class ReferenceGrammarTestLanguageErwachsenerConsumer extends NonTe ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java index e0a65f1..e94863a 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java @@ -61,6 +61,7 @@ public final class ReferenceGrammarTestLanguageFamilieConsumer extends NonTermin ruleCall$15$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeGroup$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java index 4cce205..5f88bfe 100644 --- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java +++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java @@ -36,6 +36,7 @@ public final class ReferenceGrammarTestLanguageFarbeConsumer extends NonTerminal keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } + @Override protected int doConsume(int entryPoint) throws Exception { return consumeAlternatives$1(entryPoint); } diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java b/tests/org.eclipse.xtext.xtend. |