aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-02 09:28:52 (EST)
committersefftinge2009-03-02 09:28:52 (EST)
commit313a4b06f02b8019ede5a38d70e253a27db31f23 (patch)
treeb74575244f83d73cf072ae667946f48fc255fa30
parent04df253914f10e41d7119969a80bf7edfa34e7c7 (diff)
downloadorg.eclipse.xtext-313a4b06f02b8019ede5a38d70e253a27db31f23.zip
org.eclipse.xtext-313a4b06f02b8019ede5a38d70e253a27db31f23.tar.gz
org.eclipse.xtext-313a4b06f02b8019ede5a38d70e253a27db31f23.tar.bz2
Use keyword 'with' instead of 'extends' to use other languages, no implicit usage of common.Terminals (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266429, https://bugs.eclipse.org/bugs/show_bug.cgi?id=266430)
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java1
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java3
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java25
-rw-r--r--devtools/org.eclipse.xtext.reference/src/org/eclipse/xtext/reference/ReferenceGrammar.xtext2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java1
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java25
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/Domainmodel.xtext2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java1
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java3
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java25
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java1
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java3
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java25
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDsl.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi28
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java33
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java126
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java206
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java2296
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java130
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java341
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi26
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parseTreeConstruction/XtextTerminalsTestLanguageParsetreeConstructor.java126
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.tokens8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java206
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java2296
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageDelimiters.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java127
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java341
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Grammar.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/XtextTerminalsTestLanguagePackage.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GrammarImpl.java63
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/TransientValuesTestParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/MultiValueFeatureTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/services/MultiValueFeatureTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java57
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ActionTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/FowlerDslTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/LexerTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/LookaheadTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/OptionalEmptyTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/PartialParserTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/SimpleExpressionsTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/Bug250313ParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java63
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTest.java6
-rwxr-xr-xtests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestLanguage.xtext4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/LangATestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/dummy/DummyTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext2
-rwxr-xr-xtests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xtext2
-rwxr-xr-xtests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java117
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LexerTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TreeTestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/valueconverter/Bug250313.xtext2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/parser/packrat/XtextPackratParserTest.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java5
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext36
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi28
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java23
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java126
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g40
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java206
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java2296
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g22
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java130
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java341
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java44
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java57
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext12
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/tests/Activator.java26
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java24
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java63
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageUiModule.java8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xtext1
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/TestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src/org/eclipse/xtext/ui/integration/TestLanguage.xtext2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext5
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext30
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi28
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java126
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g40
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens8
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java206
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java2296
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g22
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java8
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java130
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java341
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java44
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java57
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java25
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java24
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/XtextTestPackage.java16
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java63
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java6
314 files changed, 8119 insertions, 7293 deletions
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 a62ee40..173a445 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.reference.ReferenceGrammar" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.reference.ReferenceGrammar" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="referenceGrammar">
<ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/>
</metamodelDeclarations>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java
index 961a717..c46b4f7 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java
@@ -19,7 +19,6 @@ public class ReferenceGrammarStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
index 24ba9e4..e95485b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarSpielplatzConsumer;
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarPersonConsumer;
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarKindConsumer;
@@ -29,7 +28,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class ReferenceGrammarParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private ReferenceGrammarSpielplatzConsumer spielplatzConsumer;
private ReferenceGrammarPersonConsumer personConsumer;
private ReferenceGrammarKindConsumer kindConsumer;
@@ -166,7 +164,6 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
getCustomTypeParserRuleConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarDelimiters.ruleCall$44$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
index bc0c3f8..44134e1 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
@@ -484,12 +484,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public ReferenceGrammarGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public ReferenceGrammarGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -497,8 +498,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -544,36 +545,36 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/devtools/org.eclipse.xtext.reference/src/org/eclipse/xtext/reference/ReferenceGrammar.xtext b/devtools/org.eclipse.xtext.reference/src/org/eclipse/xtext/reference/ReferenceGrammar.xtext
index f9a2665..e5c5a5a 100644
--- a/devtools/org.eclipse.xtext.reference/src/org/eclipse/xtext/reference/ReferenceGrammar.xtext
+++ b/devtools/org.eclipse.xtext.reference/src/org/eclipse/xtext/reference/ReferenceGrammar.xtext
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
*******************************************************************************/
-grammar org.eclipse.xtext.reference.ReferenceGrammar
+grammar org.eclipse.xtext.reference.ReferenceGrammar with org.eclipse.xtext.common.Terminals
generate referenceGrammar "http://eclipse.org/xtext/reference/ReferenceGrammar"
import "http://eclipse.org/xtext/reference/ReferenceModel" as ReferenceModel
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 5e6bca2..13d39bf 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.example.Domainmodel" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.example.Domainmodel" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="domainmodel">
<ePackage href="http://www.example.xtext/Domainmodel#/"/>
</metamodelDeclarations>
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java
index 6325492..994716a 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java
@@ -19,7 +19,6 @@ public class DomainmodelStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
index 0ea715d..d07b19b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelFileConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelImportConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelNamedElementConsumer;
@@ -37,7 +36,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class DomainmodelParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private DomainmodelFileConsumer fileConsumer;
private DomainmodelImportConsumer importConsumer;
private DomainmodelNamedElementConsumer namedElementConsumer;
@@ -230,7 +228,6 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
getQualifiedNameConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters.ruleCall$43$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java
index 858c77b..1b41168 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java
@@ -592,12 +592,13 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public DomainmodelGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public DomainmodelGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -605,8 +606,8 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -692,36 +693,36 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/Domainmodel.xtext b/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/Domainmodel.xtext
index 6aa435f..9bf8575 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/Domainmodel.xtext
+++ b/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/Domainmodel.xtext
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-grammar org.eclipse.xtext.example.Domainmodel
+grammar org.eclipse.xtext.example.Domainmodel with org.eclipse.xtext.common.Terminals
generate domainmodel "http://www.example.xtext/Domainmodel"
import "http://www.eclipse.org/emf/2002/Ecore" as ecore
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 b5ec0a2..8188d24 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.example.EcoreDsl" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.example.EcoreDsl" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
<ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
</metamodelDeclarations>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java
index 36c6d62..39bb847 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java
@@ -19,7 +19,6 @@ public class EcoreDslStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
index 5ac8184..9d52af4 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEcoreDslConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslImportStatementDeclConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEPackageDeclConsumer;
@@ -45,7 +44,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private EcoreDslEcoreDslConsumer ecoreDslConsumer;
private EcoreDslImportStatementDeclConsumer importStatementDeclConsumer;
private EcoreDslEPackageDeclConsumer ePackageDeclConsumer;
@@ -423,7 +421,6 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getSintConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
index fe02194..989c7f4 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
@@ -1976,12 +1976,13 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public EcoreDslGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public EcoreDslGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -1989,8 +1990,8 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -2116,36 +2117,36 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
index e54c3c2..2878e13 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
@@ -1,4 +1,4 @@
-grammar org.eclipse.xtext.example.EcoreDsl
+grammar org.eclipse.xtext.example.EcoreDsl with org.eclipse.xtext.common.Terminals
import "http://www.eclipse.org/emf/2002/Ecore" as ecore
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 109f775..528c858 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.example.FowlerDsl" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.example.FowlerDsl" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl">
<ePackage href="http://example.xtext.org/FowlerDsl#/"/>
</metamodelDeclarations>
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java
index 17a2486..03f4420 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java
@@ -19,7 +19,6 @@ public class FowlerDslStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java
index e68700b..eb4c5c6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.example.services.FowlerDslGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslStatemachineConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslEventConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslCommandConsumer;
@@ -26,7 +25,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class FowlerDslParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private FowlerDslStatemachineConsumer statemachineConsumer;
private FowlerDslEventConsumer eventConsumer;
private FowlerDslCommandConsumer commandConsumer;
@@ -119,7 +117,6 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration {
getTransitionConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.FowlerDslDelimiters.keyword$49$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
index d90ed9d..d72d2a2 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
@@ -276,12 +276,13 @@ public class FowlerDslGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public FowlerDslGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public FowlerDslGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -289,8 +290,8 @@ public class FowlerDslGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -321,36 +322,36 @@ public class FowlerDslGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDsl.xtext b/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDsl.xtext
index 6061d56..10213f3 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDsl.xtext
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src/org/eclipse/xtext/example/FowlerDsl.xtext
@@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-grammar org.eclipse.xtext.example.FowlerDsl
+grammar org.eclipse.xtext.example.FowlerDsl with org.eclipse.xtext.common.Terminals
generate fowlerdsl "http://example.xtext.org/FowlerDsl"
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore
index be0dba0..fccae78 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.ecore
@@ -4,7 +4,7 @@
<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="superGrammar" eType="//Grammar"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usedGrammars" unique="false" upperBound="-1" eType="//Grammar"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="definesHiddenTokens">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eStructuralFeatures>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
index eb0f2fc..d329719 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
@@ -8,7 +8,7 @@
<ecoreFeature xsi:type="ecore:EAttribute" href="XtextGrammarTestLanguage.ecore#//Grammar/name"/>
</genFeatures>
<genFeatures notify="false" createChild="false" propertySortChoices="true">
- <ecoreFeature xsi:type="ecore:EReference" href="XtextGrammarTestLanguage.ecore#//Grammar/superGrammar"/>
+ <ecoreFeature xsi:type="ecore:EReference" href="XtextGrammarTestLanguage.ecore#//Grammar/usedGrammars"/>
</genFeatures>
<genFeatures createChild="false">
<ecoreFeature xsi:type="ecore:EAttribute" href="XtextGrammarTestLanguage.ecore#//Grammar/definesHiddenTokens"/>
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 89b574e..0d15e1a 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.XtextGrammarTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.XtextGrammarTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="xtextTest">
<ePackage href="http://www.eclipse.org/2008/Test/XtextTest#/"/>
</metamodelDeclarations>
@@ -22,13 +22,25 @@
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
- <abstractTokens xsi:type="xtext:Keyword" value="extends"/>
- <abstractTokens xsi:type="xtext:Assignment" feature="superGrammar" operator="=">
- <terminal xsi:type="xtext:CrossReference" rule="/0/@rules.1">
- <type metamodel="/0/@metamodelDeclarations.0">
- <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Grammar"/>
- </type>
- </terminal>
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="with"/>
+ <abstractTokens xsi:type="xtext:Assignment" feature="usedGrammars" operator="+=">
+ <terminal xsi:type="xtext:CrossReference" rule="/0/@rules.1">
+ <type metamodel="/0/@metamodelDeclarations.0">
+ <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Grammar"/>
+ </type>
+ </terminal>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Group" cardinality="*">
+ <abstractTokens xsi:type="xtext:Keyword" value=","/>
+ <abstractTokens xsi:type="xtext:Assignment" feature="usedGrammars" operator="+=">
+ <terminal xsi:type="xtext:CrossReference" rule="/0/@rules.1">
+ <type metamodel="/0/@metamodelDeclarations.0">
+ <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Grammar"/>
+ </type>
+ </terminal>
+ </abstractTokens>
</abstractTokens>
</abstractTokens>
</abstractTokens>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java
index 845a993..5b60e41 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class XtextGrammarTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
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 56ad3fc..421803f 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.crossrefs.ImportUriTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.crossrefs.ImportUriTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="importedURI">
<ePackage href="http://eclipse.org/xtext/importUriTestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java
index 6a6876d..4a5ef79 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class ImportUriTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
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 5ab4bb0..8b71bf9 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.crossrefs.LangATestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.crossrefs.LangATestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="langATestLanguage">
<ePackage href="http://eclipse.org/xtext/langATestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java
index c61f0e1..0ad1689 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class LangATestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java
index 3a77a36..147b537 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.ImportUriTestLanguageMainConsumer;
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.ImportUriTestLanguageImportConsumer;
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.ImportUriTestLanguageTypeConsumer;
@@ -24,7 +23,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class ImportUriTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private ImportUriTestLanguageMainConsumer mainConsumer;
private ImportUriTestLanguageImportConsumer importConsumer;
private ImportUriTestLanguageTypeConsumer typeConsumer;
@@ -88,7 +86,6 @@ public class ImportUriTestLanguageParserConfiguration extends AbstractParserConf
getTypeConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.crossrefs.parser.packrat.ImportUriTestLanguageDelimiters.ruleCall$21$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java
index fab87cf..a000bde 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.crossrefs.services.LangATestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.LangATestLanguageMainConsumer;
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.LangATestLanguageImportConsumer;
import org.eclipse.xtext.crossrefs.parser.packrat.consumers.LangATestLanguageTypeConsumer;
@@ -24,7 +23,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class LangATestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private LangATestLanguageMainConsumer mainConsumer;
private LangATestLanguageImportConsumer importConsumer;
private LangATestLanguageTypeConsumer typeConsumer;
@@ -88,7 +86,6 @@ public class LangATestLanguageParserConfiguration extends AbstractParserConfigur
getTypeConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.crossrefs.parser.packrat.LangATestLanguageDelimiters.ruleCall$21$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
index b7159eb..08b1579 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
@@ -116,12 +116,13 @@ public class ImportUriTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public ImportUriTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public ImportUriTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -129,8 +130,8 @@ public class ImportUriTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -151,36 +152,36 @@ public class ImportUriTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
index 750d63a..05ed656 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
@@ -116,12 +116,13 @@ public class LangATestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public LangATestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public LangATestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -129,8 +130,8 @@ public class LangATestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -151,36 +152,36 @@ public class LangATestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
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 9619b0a..125150b 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.dummy.DummyTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.dummy.DummyTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="dummyLang">
<ePackage href="http://www.eclipse.org/2008/xtext/DummyLang#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java
index 7099b19..7aac4e3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class DummyTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java
index a88cdaf..bfa5787 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.dummy.services.DummyTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.dummy.parser.packrat.consumers.DummyTestLanguageModelConsumer;
import org.eclipse.xtext.dummy.parser.packrat.consumers.DummyTestLanguageElementConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
@@ -23,7 +22,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class DummyTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private DummyTestLanguageModelConsumer modelConsumer;
private DummyTestLanguageElementConsumer elementConsumer;
@@ -79,7 +77,6 @@ public class DummyTestLanguageParserConfiguration extends AbstractParserConfigur
getElementConsumer().setRuleCall$11$Delimiter(org.eclipse.xtext.dummy.parser.packrat.DummyTestLanguageDelimiters.ruleCall$17$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
index 7c74c62..e2fdc63 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
@@ -92,12 +92,13 @@ public class DummyTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public DummyTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public DummyTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -105,8 +106,8 @@ public class DummyTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -122,36 +123,36 @@ public class DummyTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
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 ba508ac..3c829a5 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.generator.lowerCaseNamedTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.generator.lowerCaseNamedTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="lowerCaseNamedTestLanguage">
<ePackage href="http://www.eclipse.org/2009/tmf/xtext/lowerCaseNamedTestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java
index bed54dc..2fa375a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class lowerCaseNamedTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java
index 225a8b1..a7cf182 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.generator.services.LowerCaseNamedTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.generator.parser.packrat.consumers.LowerCaseNamedTestLanguageModelConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
@@ -22,7 +21,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class lowerCaseNamedTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private LowerCaseNamedTestLanguageModelConsumer modelConsumer;
private LowerCaseNamedTestLanguageGrammarAccess grammarAccess;
@@ -66,7 +64,6 @@ public class lowerCaseNamedTestLanguageParserConfiguration extends AbstractParse
getModelConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.generator.parser.packrat.lowerCaseNamedTestLanguageDelimiters.ruleCall$4$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java
index 1b57e16..5b3dd2d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java
@@ -36,12 +36,13 @@ public class LowerCaseNamedTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public LowerCaseNamedTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public LowerCaseNamedTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -49,8 +50,8 @@ public class LowerCaseNamedTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -61,36 +62,36 @@ public class LowerCaseNamedTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
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 6ca0911..59194fd 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm">
<ePackage href="http://www.eclipse.org/xtext/tests/grammarinheritance#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java
index 659ce0c..b4e4017 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class AbstractTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi
index 9c00ce9..e442da0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="baseInheritanceTest">
<ePackage href="http://www.eclipse.org/2009/tmf/xtext/BaseInheritanceTestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java
index eb99f43..837fb39 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class BaseInheritanceTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
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 09c92bc..705e443 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="foo">
<ePackage href="http://holla#/"/>
</metamodelDeclarations>
@@ -148,7 +148,7 @@
</alternatives>
</rules>
</xtext:Grammar>
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage" superGrammar="/2">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.AbstractTestLanguage" usedGrammars="/2">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm">
<ePackage href="http://www.eclipse.org/xtext/tests/grammarinheritance#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java
index eeff8f0..35b28ab 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class ConcreteTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.grammarinheritance.AbstractTestLanguageStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi
index d5b6ac4..65b9492 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xmi
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.InheritanceTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.InheritanceTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="inheritanceTest">
<ePackage href="http://www.eclipse.org/2009/tmf/xtext/InheritanceTestLanguage#/"/>
</metamodelDeclarations>
@@ -38,7 +38,7 @@
</alternatives>
</rules>
</xtext:Grammar>
- <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage" superGrammar="/2">
+ <xtext:Grammar name="org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage" usedGrammars="/2">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="baseInheritanceTest">
<ePackage href="http://www.eclipse.org/2009/tmf/xtext/BaseInheritanceTestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java
index e0cbba4..de07025 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class InheritanceTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguageStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java
index 874249e9..e18c0b8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.AbstractTestLanguageInheritedParserRuleConsumer;
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.AbstractTestLanguageAbstractCallOverridenParserRuleConsumer;
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.AbstractTestLanguageOverridableParserRuleConsumer;
@@ -28,7 +27,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class AbstractTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private AbstractTestLanguageInheritedParserRuleConsumer inheritedParserRuleConsumer;
private AbstractTestLanguageAbstractCallOverridenParserRuleConsumer abstractCallOverridenParserRuleConsumer;
private AbstractTestLanguageOverridableParserRuleConsumer overridableParserRuleConsumer;
@@ -121,7 +119,6 @@ public class AbstractTestLanguageParserConfiguration extends AbstractParserConfi
getExtendableParserRuleConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.grammarinheritance.parser.packrat.AbstractTestLanguageDelimiters.ruleCall$7$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java
index f8cdfac..04c834d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.grammarinheritance.services.BaseInheritanceTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.BaseInheritanceTestLanguageModelConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
@@ -22,7 +21,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class BaseInheritanceTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private BaseInheritanceTestLanguageModelConsumer modelConsumer;
private BaseInheritanceTestLanguageGrammarAccess grammarAccess;
@@ -67,7 +65,6 @@ public class BaseInheritanceTestLanguageParserConfiguration extends AbstractPars
getModelConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.grammarinheritance.parser.packrat.BaseInheritanceTestLanguageDelimiters.ruleCall$6$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java
index af3c3a5..57f3d33 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.grammarinheritance.services.ConcreteTestLanguageGrammarAccess;
import org.eclipse.xtext.grammarinheritance.parser.packrat.AbstractTestLanguageParserConfiguration;
-
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.ConcreteTestLanguageRootRuleConsumer;
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.ConcreteTestLanguageConcreteParserRuleConsumer;
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.ConcreteTestLanguageOverridableParserRuleConsumer;
@@ -35,7 +34,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final AbstractTestLanguageParserConfiguration abstractTestLanguageConfiguration;
-
private ConcreteTestLanguageRootRuleConsumer rootRuleConsumer;
private ConcreteTestLanguageConcreteParserRuleConsumer concreteParserRuleConsumer;
private ConcreteTestLanguageOverridableParserRuleConsumer overridableParserRuleConsumer;
@@ -182,7 +180,6 @@ public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfi
getAbstractCallExtendedParserRuleConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.grammarinheritance.parser.packrat.ConcreteTestLanguageDelimiters.keyword$16$Delimiter);
}
- // TODO collect superGrammars transitive
public AbstractTestLanguageParserConfiguration getAbstractTestLanguageConfiguration() {
return abstractTestLanguageConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java
index 2b73df8..94dfd0b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.grammarinheritance.services.InheritanceTestLanguageGrammarAccess;
import org.eclipse.xtext.grammarinheritance.parser.packrat.BaseInheritanceTestLanguageParserConfiguration;
-
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.InheritanceTestLanguageModelConsumer;
import org.eclipse.xtext.grammarinheritance.parser.packrat.consumers.InheritanceTestLanguageElementConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
@@ -23,7 +22,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class InheritanceTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final BaseInheritanceTestLanguageParserConfiguration baseInheritanceTestLanguageConfiguration;
-
private InheritanceTestLanguageModelConsumer modelConsumer;
private InheritanceTestLanguageElementConsumer elementConsumer;
@@ -80,7 +78,6 @@ public class InheritanceTestLanguageParserConfiguration extends AbstractParserCo
getElementConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.grammarinheritance.parser.packrat.InheritanceTestLanguageDelimiters.ruleCall$9$Delimiter);
}
- // TODO collect superGrammars transitive
public BaseInheritanceTestLanguageParserConfiguration getBaseInheritanceTestLanguageConfiguration() {
return baseInheritanceTestLanguageConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
index 3fe34e5..1cb6a20 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
@@ -166,12 +166,13 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public AbstractTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public AbstractTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -179,8 +180,8 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -226,31 +227,31 @@ public class AbstractTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java
index 7088e41..b8efdb0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java
@@ -44,12 +44,13 @@ public class BaseInheritanceTestLanguageGrammarAccess implements IGrammarAccess
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public BaseInheritanceTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public BaseInheritanceTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -57,8 +58,8 @@ public class BaseInheritanceTestLanguageGrammarAccess implements IGrammarAccess
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -69,36 +70,36 @@ public class BaseInheritanceTestLanguageGrammarAccess implements IGrammarAccess
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index 876dabe..524b7b9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -336,12 +336,13 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private AbstractTestLanguageGrammarAccess superGrammarAccess;
+ private AbstractTestLanguageGrammarAccess abstractTestLanguageGrammarAccess;
@Inject
- public ConcreteTestLanguageGrammarAccess(GrammarProvider grammarProvider, AbstractTestLanguageGrammarAccess superGrammarAccess) {
+ public ConcreteTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ AbstractTestLanguageGrammarAccess abstractTestLanguageGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.abstractTestLanguageGrammarAccess = abstractTestLanguageGrammarAccess;
}
public Grammar getGrammar() {
@@ -349,8 +350,8 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
}
- public AbstractTestLanguageGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public AbstractTestLanguageGrammarAccess getAbstractTestLanguageGrammarAccess() {
+ return abstractTestLanguageGrammarAccess;
}
@@ -406,56 +407,56 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammarAccess.InheritedParserRuleElements prInheritedParserRule() {
- return superGrammarAccess.prInheritedParserRule();
+ return abstractTestLanguageGrammarAccess.prInheritedParserRule();
}
// not supported
public org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements prAbstractCallOverridenParserRule() {
- return superGrammarAccess.prAbstractCallOverridenParserRule();
+ return abstractTestLanguageGrammarAccess.prAbstractCallOverridenParserRule();
}
// not supported
public org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements prAbstractCallExtendedParserRule() {
- return superGrammarAccess.prAbstractCallExtendedParserRule();
+ return abstractTestLanguageGrammarAccess.prAbstractCallExtendedParserRule();
}
// not supported
public TerminalRule trREAL() {
- return superGrammarAccess.trREAL();
+ return abstractTestLanguageGrammarAccess.trREAL();
}
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return abstractTestLanguageGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return abstractTestLanguageGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return abstractTestLanguageGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return abstractTestLanguageGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return abstractTestLanguageGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return abstractTestLanguageGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return abstractTestLanguageGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
index 7232344..ce81e93 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
@@ -96,12 +96,13 @@ public class InheritanceTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private BaseInheritanceTestLanguageGrammarAccess superGrammarAccess;
+ private BaseInheritanceTestLanguageGrammarAccess baseInheritanceTestLanguageGrammarAccess;
@Inject
- public InheritanceTestLanguageGrammarAccess(GrammarProvider grammarProvider, BaseInheritanceTestLanguageGrammarAccess superGrammarAccess) {
+ public InheritanceTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ BaseInheritanceTestLanguageGrammarAccess baseInheritanceTestLanguageGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.baseInheritanceTestLanguageGrammarAccess = baseInheritanceTestLanguageGrammarAccess;
}
public Grammar getGrammar() {
@@ -109,8 +110,8 @@ public class InheritanceTestLanguageGrammarAccess implements IGrammarAccess {
}
- public BaseInheritanceTestLanguageGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public BaseInheritanceTestLanguageGrammarAccess getBaseInheritanceTestLanguageGrammarAccess() {
+ return baseInheritanceTestLanguageGrammarAccess;
}
@@ -126,36 +127,36 @@ public class InheritanceTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return baseInheritanceTestLanguageGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return baseInheritanceTestLanguageGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return baseInheritanceTestLanguageGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return baseInheritanceTestLanguageGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return baseInheritanceTestLanguageGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return baseInheritanceTestLanguageGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return baseInheritanceTestLanguageGrammarAccess.trANY_OTHER();
}
}
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 75f9103..374d5c3 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="xtext">
<ePackage href="http://www.eclipse.org/2008/Xtext#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java
index 622e18c..fd18045 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class MetamodelRefTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
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 21b6e2c..e3e4457 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simpleTest">
<ePackage href="http://eclipse.org/xtext/tests/SimpleTest#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java
index f629edb..7db5f53 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class MultiGenMMTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java
index db0d4ce..4378f64 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers.MetamodelRefTestLanguageFooConsumer;
import org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers.MetamodelRefTestLanguageNameRefConsumer;
import org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers.MetamodelRefTestLanguageMyRuleConsumer;
@@ -24,7 +23,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class MetamodelRefTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private MetamodelRefTestLanguageFooConsumer fooConsumer;
private MetamodelRefTestLanguageNameRefConsumer nameRefConsumer;
private MetamodelRefTestLanguageMyRuleConsumer myRuleConsumer;
@@ -85,7 +83,6 @@ public class MetamodelRefTestLanguageParserConfiguration extends AbstractParserC
getMyRuleConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.MetamodelRefTestLanguageDelimiters.ruleCall$6$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java
index 2e524b3..fc83a68 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers.MultiGenMMTestLanguageFooConsumer;
import org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers.MultiGenMMTestLanguageNameRefConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
@@ -23,7 +22,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class MultiGenMMTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private MultiGenMMTestLanguageFooConsumer fooConsumer;
private MultiGenMMTestLanguageNameRefConsumer nameRefConsumer;
@@ -76,7 +74,6 @@ public class MultiGenMMTestLanguageParserConfiguration extends AbstractParserCon
getNameRefConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.MultiGenMMTestLanguageDelimiters.ruleCall$6$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
index 003bc91..4ec9396 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
@@ -80,12 +80,13 @@ public class MetamodelRefTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public MetamodelRefTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public MetamodelRefTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -93,8 +94,8 @@ public class MetamodelRefTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -115,36 +116,36 @@ public class MetamodelRefTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
index 24a19d0..b94507e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
@@ -64,12 +64,13 @@ public class MultiGenMMTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public MultiGenMMTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public MultiGenMMTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -77,8 +78,8 @@ public class MultiGenMMTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -94,36 +95,36 @@ public class MultiGenMMTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java
index fe135b2..3a15fea 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java
@@ -265,9 +265,9 @@ protected class Grammar_0_0_0_1_Group extends GroupToken {
@Override
protected Solution createSolution() {
- Solution s1 = new Grammar_0_0_0_1_1_Assignment_superGrammar(current, this).firstSolution();
+ Solution s1 = new Grammar_0_0_0_1_1_Group(current, this).firstSolution();
while(s1 != null) {
- Solution s2 = new Grammar_0_0_0_1_0_Keyword_extends(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ Solution s2 = new Grammar_0_0_0_1_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
if(s2 == null) {
s1 = s1.getPredecessor().nextSolution(this,s1);
if(s1 == null) return null;
@@ -282,38 +282,139 @@ protected class Grammar_0_0_0_1_Group extends GroupToken {
}
// not supported
-protected class Grammar_0_0_0_1_0_Keyword_extends extends KeywordToken {
+protected class Grammar_0_0_0_1_0_Group extends GroupToken {
- public Grammar_0_0_0_1_0_Keyword_extends(IInstanceDescription curr, AbstractToken pred) {
+ public Grammar_0_0_0_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
+ super(curr, pred, !IS_MANY, IS_REQUIRED);
+ }
+
+ @Override
+ public Group getGrammarElement() {
+ return grammarAccess.prGrammar().ele00010Group();
+ }
+
+ @Override
+ protected Solution createSolution() {
+ Solution s1 = new Grammar_0_0_0_1_0_1_Assignment_usedGrammars(current, this).firstSolution();
+ while(s1 != null) {
+ Solution s2 = new Grammar_0_0_0_1_0_0_Keyword_with(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ if(s2 == null) {
+ s1 = s1.getPredecessor().nextSolution(this,s1);
+ if(s1 == null) return null;
+ } else {
+ last = s2.getPredecessor();
+ return s2;
+ }
+ }
+ return null;
+
+ }
+}
+
+// not supported
+protected class Grammar_0_0_0_1_0_0_Keyword_with extends KeywordToken {
+
+ public Grammar_0_0_0_1_0_0_Keyword_with(IInstanceDescription curr, AbstractToken pred) {
+ super(curr, pred, !IS_MANY, IS_REQUIRED);
+ }
+
+ public Keyword getGrammarElement() {
+ return grammarAccess.prGrammar().ele000100KeywordWith();
+ }
+}
+
+// not supported
+protected class Grammar_0_0_0_1_0_1_Assignment_usedGrammars extends AssignmentToken {
+
+ public Grammar_0_0_0_1_0_1_Assignment_usedGrammars(IInstanceDescription curr, AbstractToken pred) {
+ super(curr, pred, !IS_MANY, IS_REQUIRED);
+ }
+
+ @Override
+ public Assignment getGrammarElement() {
+ return grammarAccess.prGrammar().ele000101AssignmentUsedGrammars();
+ }
+
+ @Override
+ protected Solution createSolution() {
+ if((value = current.getConsumable("usedGrammars",IS_REQUIRED)) == null) return null;
+ IInstanceDescription obj = current.cloneAndConsume("usedGrammars");
+ if(value instanceof EObject) { // xtext::CrossReference
+ IInstanceDescription param = getDescr((EObject)value);
+ if(param.isInstanceOf(grammarAccess.prGrammar().ele0001010CrossReferenceEStringGrammar().getType().getType())) {
+ type = AssignmentType.CR;
+ element = grammarAccess.prGrammar().ele0001010CrossReferenceEStringGrammar();
+ return new Solution(obj);
+ }
+ }
+ return null;
+ }
+}
+
+
+// not supported
+protected class Grammar_0_0_0_1_1_Group extends GroupToken {
+
+ public Grammar_0_0_0_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
+ super(curr, pred, IS_MANY, !IS_REQUIRED);
+ }
+
+ @Override
+ public Group getGrammarElement() {
+ return grammarAccess.prGrammar().ele00011Group();
+ }
+
+ @Override
+ protected Solution createSolution() {
+ Solution s1 = new Grammar_0_0_0_1_1_1_Assignment_usedGrammars(current, this).firstSolution();
+ while(s1 != null) {
+ Solution s2 = new Grammar_0_0_0_1_1_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ if(s2 == null) {
+ s1 = s1.getPredecessor().nextSolution(this,s1);
+ if(s1 == null) return null;
+ } else {
+ last = s2.getPredecessor();
+ return s2;
+ }
+ }
+ return null;
+
+ }
+}
+
+// not supported
+protected class Grammar_0_0_0_1_1_0_Keyword extends KeywordToken {
+
+ public Grammar_0_0_0_1_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
public Keyword getGrammarElement() {
- return grammarAccess.prGrammar().ele00010KeywordExtends();
+ return grammarAccess.prGrammar().ele000110KeywordComma();
}
}
// not supported
-protected class Grammar_0_0_0_1_1_Assignment_superGrammar extends AssignmentToken {
+protected class Grammar_0_0_0_1_1_1_Assignment_usedGrammars extends AssignmentToken {
- public Grammar_0_0_0_1_1_Assignment_superGrammar(IInstanceDescription curr, AbstractToken pred) {
+ public Grammar_0_0_0_1_1_1_Assignment_usedGrammars(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
@Override
public Assignment getGrammarElement() {
- return grammarAccess.prGrammar().ele00011AssignmentSuperGrammar();
+ return grammarAccess.prGrammar().ele000111AssignmentUsedGrammars();
}
@Override
protected Solution createSolution() {
- if((value = current.getConsumable("superGrammar",!IS_REQUIRED)) == null) return null;
- IInstanceDescription obj = current.cloneAndConsume("superGrammar");
+ if((value = current.getConsumable("usedGrammars",!IS_REQUIRED)) == null) return null;
+ IInstanceDescription obj = current.cloneAndConsume("usedGrammars");
if(value instanceof EObject) { // xtext::CrossReference
IInstanceDescription param = getDescr((EObject)value);
- if(param.isInstanceOf(grammarAccess.prGrammar().ele000110CrossReferenceEStringGrammar().getType().getType())) {
+ if(param.isInstanceOf(grammarAccess.prGrammar().ele0001110CrossReferenceEStringGrammar().getType().getType())) {
type = AssignmentType.CR;
- element = grammarAccess.prGrammar().ele000110CrossReferenceEStringGrammar();
+ element = grammarAccess.prGrammar().ele0001110CrossReferenceEStringGrammar();
return new Solution(obj);
}
}
@@ -323,6 +424,7 @@ protected class Grammar_0_0_0_1_1_Assignment_superGrammar extends AssignmentToke
+
// not supported
protected class Grammar_0_0_1_Group extends GroupToken {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g
index bcb2bea..9ff392e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g
@@ -105,9 +105,9 @@ ruleGrammar returns [EObject current=null]
currentNode = currentNode.getParent();
}
-))('extends'
+))(('with'
{
- createLeafNode(grammarAccess.prGrammar().ele00010KeywordExtends(), null);
+ createLeafNode(grammarAccess.prGrammar().ele000100KeywordWith(), null);
}
(
@@ -119,7 +119,7 @@ ruleGrammar returns [EObject current=null]
}
}
{
- currentNode=createCompositeNode(grammarAccess.prGrammar().ele000110CrossReferenceEStringGrammar(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.prGrammar().ele0001010CrossReferenceEStringGrammar(), currentNode);
}
ruleGrammarID {
currentNode = currentNode.getParent();
@@ -127,9 +127,31 @@ ruleGrammar returns [EObject current=null]
// TODO assign feature to currentNode
-))?)((((
+))(','
+ {
+ createLeafNode(grammarAccess.prGrammar().ele000110KeywordComma(), null);
+ }
+(
+
+
+ {
+ if ($current==null) {
+ $current = factory.create(grammarAccess.prGrammar().getRule().getType().getType());
+ associateNodeWithAstElement(currentNode, $current);
+ }
+ }
+ {
+ currentNode=createCompositeNode(grammarAccess.prGrammar().ele0001110CrossReferenceEStringGrammar(), currentNode);
+ }
+ ruleGrammarID {
+ currentNode = currentNode.getParent();
+ }
+
+ // TODO assign feature to currentNode
+
+))*)?)((((
- lv_definesHiddenTokens_4='hidden'
+ lv_definesHiddenTokens_6='hidden'
{
createLeafNode(grammarAccess.prGrammar().ele0010000KeywordHidden(), "definesHiddenTokens");
}
@@ -198,7 +220,7 @@ ruleGrammar returns [EObject current=null]
{
currentNode=createCompositeNode(grammarAccess.prGrammar().ele010ParserRuleCallAbstractMetamodelDeclaration(), currentNode);
}
- lv_metamodelDeclarations_10=ruleAbstractMetamodelDeclaration
+ lv_metamodelDeclarations_12=ruleAbstractMetamodelDeclaration
{
if ($current==null) {
$current = factory.create(grammarAccess.prGrammar().getRule().getType().getType());
@@ -206,7 +228,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- add($current, "metamodelDeclarations", lv_metamodelDeclarations_10, "AbstractMetamodelDeclaration", currentNode);
+ add($current, "metamodelDeclarations", lv_metamodelDeclarations_12, "AbstractMetamodelDeclaration", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -219,7 +241,7 @@ ruleGrammar returns [EObject current=null]
{
currentNode=createCompositeNode(grammarAccess.prGrammar().ele10ParserRuleCallAbstractRule(), currentNode);
}
- lv_rules_11=ruleAbstractRule
+ lv_rules_13=ruleAbstractRule
{
if ($current==null) {
$current = factory.create(grammarAccess.prGrammar().getRule().getType().getType());
@@ -227,7 +249,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- add($current, "rules", lv_rules_11, "AbstractRule", currentNode);
+ add($current, "rules", lv_rules_13, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens
index fc81661..5045dd9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.tokens
@@ -11,11 +11,12 @@ RULE_SL_COMMENT=8
'generate'=18
'terminal'=24
'?='=32
+'with'=12
';'=23
']'=40
'?'=27
-','=15
-'hidden'=13
+','=13
+'hidden'=14
'='=31
'['=39
'::'=25
@@ -26,11 +27,10 @@ RULE_SL_COMMENT=8
'{'=33
'!'=36
'+='=30
-'('=14
+'('=15
'as'=19
':'=22
'.'=17
-'extends'=12
'*'=28
'+'=29
'}'=35
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java
index 8aaa626..f180076 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java
@@ -79,10 +79,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'extends' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:7: 'extends'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'with' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:11:7: 'with'
{
- match("extends");
+ match("with");
}
@@ -98,11 +98,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT13() throws RecognitionException {
try {
int _type = T13;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:5: ( 'hidden' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:7: 'hidden'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:5: ( ',' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:12:7: ','
{
- match("hidden");
-
+ match(',');
}
@@ -117,10 +116,11 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:5: ( '(' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:7: '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'hidden' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:13:7: 'hidden'
{
- match('(');
+ match("hidden");
+
}
@@ -135,10 +135,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:5: ( ',' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:7: ','
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:5: ( '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:14:7: '('
{
- match(',');
+ match('(');
}
@@ -614,10 +614,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:9: ( ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:11: ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2193:9: ( ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2193:11: ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:11: ( '^' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2193:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -626,7 +626,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:11: '^'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2193:11: '^'
{
match('^');
@@ -645,7 +645,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2193:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -693,10 +693,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2173:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2173:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2195:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2195:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2173:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2195:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -710,7 +710,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2173:13: '0' .. '9'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2195:13: '0' .. '9'
{
matchRange('0','9');
@@ -740,10 +740,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -755,16 +755,16 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2175:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("2197:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -780,7 +780,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:22: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:22: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -797,7 +797,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:76: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:76: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -823,10 +823,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -842,7 +842,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -859,7 +859,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:158: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2197:158: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -901,12 +901,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2177:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2177:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2199:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2199:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2177:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2199:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -931,7 +931,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2177:52: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2199:52: .
{
matchAny();
@@ -959,12 +959,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -977,7 +977,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -998,7 +998,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1007,9 +1007,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:41: ( '\\r' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1018,7 +1018,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2179:41: '\\r'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2201:41: '\\r'
{
match('\r');
@@ -1048,10 +1048,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2181:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2181:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2203:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2203:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2181:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2203:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -1104,8 +1104,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2183:16: ( . )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2183:18: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2205:16: ( . )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2205:18: .
{
matchAny();
@@ -1142,12 +1142,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_95 = input.LA(7);
if ( (LA12_95=='t') ) {
- int LA12_103 = input.LA(8);
+ int LA12_102 = input.LA(8);
- if ( (LA12_103=='e') ) {
- int LA12_111 = input.LA(9);
+ if ( (LA12_102=='e') ) {
+ int LA12_109 = input.LA(9);
- if ( ((LA12_111>='0' && LA12_111<='9')||(LA12_111>='A' && LA12_111<='Z')||LA12_111=='_'||(LA12_111>='a' && LA12_111<='z')) ) {
+ if ( ((LA12_109>='0' && LA12_109<='9')||(LA12_109>='A' && LA12_109<='Z')||LA12_109=='_'||(LA12_109>='a' && LA12_109<='z')) ) {
alt12=31;
}
else {
@@ -1189,9 +1189,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_96 = input.LA(7);
if ( (LA12_96=='r') ) {
- int LA12_104 = input.LA(8);
+ int LA12_103 = input.LA(8);
- if ( ((LA12_104>='0' && LA12_104<='9')||(LA12_104>='A' && LA12_104<='Z')||LA12_104=='_'||(LA12_104>='a' && LA12_104<='z')) ) {
+ if ( ((LA12_103>='0' && LA12_103<='9')||(LA12_103>='A' && LA12_103<='Z')||LA12_103=='_'||(LA12_103>='a' && LA12_103<='z')) ) {
alt12=31;
}
else {
@@ -1217,41 +1217,23 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
alt12=31;}
}
- else if ( (LA12_0=='e') ) {
+ else if ( (LA12_0=='w') ) {
int LA12_2 = input.LA(2);
- if ( (LA12_2=='x') ) {
+ if ( (LA12_2=='i') ) {
int LA12_37 = input.LA(3);
if ( (LA12_37=='t') ) {
int LA12_72 = input.LA(4);
- if ( (LA12_72=='e') ) {
+ if ( (LA12_72=='h') ) {
int LA12_81 = input.LA(5);
- if ( (LA12_81=='n') ) {
- int LA12_89 = input.LA(6);
-
- if ( (LA12_89=='d') ) {
- int LA12_97 = input.LA(7);
-
- if ( (LA12_97=='s') ) {
- int LA12_105 = input.LA(8);
-
- if ( ((LA12_105>='0' && LA12_105<='9')||(LA12_105>='A' && LA12_105<='Z')||LA12_105=='_'||(LA12_105>='a' && LA12_105<='z')) ) {
- alt12=31;
- }
- else {
- alt12=2;}
- }
- else {
- alt12=31;}
- }
- else {
- alt12=31;}
+ if ( ((LA12_81>='0' && LA12_81<='9')||(LA12_81>='A' && LA12_81<='Z')||LA12_81=='_'||(LA12_81>='a' && LA12_81<='z')) ) {
+ alt12=31;
}
else {
- alt12=31;}
+ alt12=2;}
}
else {
alt12=31;}
@@ -1262,13 +1244,16 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
else {
alt12=31;}
}
+ else if ( (LA12_0==',') ) {
+ alt12=3;
+ }
else if ( (LA12_0=='h') ) {
- int LA12_3 = input.LA(2);
+ int LA12_4 = input.LA(2);
- if ( (LA12_3=='i') ) {
- int LA12_38 = input.LA(3);
+ if ( (LA12_4=='i') ) {
+ int LA12_39 = input.LA(3);
- if ( (LA12_38=='d') ) {
+ if ( (LA12_39=='d') ) {
int LA12_73 = input.LA(4);
if ( (LA12_73=='d') ) {
@@ -1278,13 +1263,13 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_90 = input.LA(6);
if ( (LA12_90=='n') ) {
- int LA12_98 = input.LA(7);
+ int LA12_97 = input.LA(7);
- if ( ((LA12_98>='0' && LA12_98<='9')||(LA12_98>='A' && LA12_98<='Z')||LA12_98=='_'||(LA12_98>='a' && LA12_98<='z')) ) {
+ if ( ((LA12_97>='0' && LA12_97<='9')||(LA12_97>='A' && LA12_97<='Z')||LA12_97=='_'||(LA12_97>='a' && LA12_97<='z')) ) {
alt12=31;
}
else {
- alt12=3;}
+ alt12=4;}
}
else {
alt12=31;}
@@ -1302,9 +1287,6 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
alt12=31;}
}
else if ( (LA12_0=='(') ) {
- alt12=4;
- }
- else if ( (LA12_0==',') ) {
alt12=5;
}
else if ( (LA12_0==')') ) {
@@ -1350,9 +1332,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_91 = input.LA(6);
if ( (LA12_91=='t') ) {
- int LA12_99 = input.LA(7);
+ int LA12_98 = input.LA(7);
- if ( ((LA12_99>='0' && LA12_99<='9')||(LA12_99>='A' && LA12_99<='Z')||LA12_99=='_'||(LA12_99>='a' && LA12_99<='z')) ) {
+ if ( ((LA12_98>='0' && LA12_98<='9')||(LA12_98>='A' && LA12_98<='Z')||LA12_98=='_'||(LA12_98>='a' && LA12_98<='z')) ) {
alt12=31;
}
else {
@@ -1389,12 +1371,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_92 = input.LA(6);
if ( (LA12_92=='n') ) {
- int LA12_100 = input.LA(7);
+ int LA12_99 = input.LA(7);
- if ( (LA12_100=='s') ) {
- int LA12_108 = input.LA(8);
+ if ( (LA12_99=='s') ) {
+ int LA12_106 = input.LA(8);
- if ( ((LA12_108>='0' && LA12_108<='9')||(LA12_108>='A' && LA12_108<='Z')||LA12_108=='_'||(LA12_108>='a' && LA12_108<='z')) ) {
+ if ( ((LA12_106>='0' && LA12_106<='9')||(LA12_106>='A' && LA12_106<='Z')||LA12_106=='_'||(LA12_106>='a' && LA12_106<='z')) ) {
alt12=31;
}
else {
@@ -1446,15 +1428,15 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_93 = input.LA(6);
if ( (LA12_93=='n') ) {
- int LA12_101 = input.LA(7);
+ int LA12_100 = input.LA(7);
- if ( (LA12_101=='a') ) {
- int LA12_109 = input.LA(8);
+ if ( (LA12_100=='a') ) {
+ int LA12_107 = input.LA(8);
- if ( (LA12_109=='l') ) {
- int LA12_115 = input.LA(9);
+ if ( (LA12_107=='l') ) {
+ int LA12_112 = input.LA(9);
- if ( ((LA12_115>='0' && LA12_115<='9')||(LA12_115>='A' && LA12_115<='Z')||LA12_115=='_'||(LA12_115>='a' && LA12_115<='z')) ) {
+ if ( ((LA12_112>='0' && LA12_112<='9')||(LA12_112>='A' && LA12_112<='Z')||LA12_112=='_'||(LA12_112>='a' && LA12_112<='z')) ) {
alt12=31;
}
else {
@@ -1527,12 +1509,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
int LA12_94 = input.LA(6);
if ( (LA12_94=='n') ) {
- int LA12_102 = input.LA(7);
+ int LA12_101 = input.LA(7);
- if ( (LA12_102=='t') ) {
- int LA12_110 = input.LA(8);
+ if ( (LA12_101=='t') ) {
+ int LA12_108 = input.LA(8);
- if ( ((LA12_110>='0' && LA12_110<='9')||(LA12_110>='A' && LA12_110<='Z')||LA12_110=='_'||(LA12_110>='a' && LA12_110<='z')) ) {
+ if ( ((LA12_108>='0' && LA12_108<='9')||(LA12_108>='A' && LA12_108<='Z')||LA12_108=='_'||(LA12_108>='a' && LA12_108<='z')) ) {
alt12=31;
}
else {
@@ -1586,7 +1568,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
else {
alt12=37;}
}
- else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||LA12_0=='f'||(LA12_0>='j' && LA12_0<='q')||LA12_0=='s'||(LA12_0>='u' && LA12_0<='z')) ) {
+ else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||(LA12_0>='d' && LA12_0<='f')||(LA12_0>='j' && LA12_0<='q')||LA12_0=='s'||(LA12_0>='u' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {
alt12=31;
}
else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
@@ -1612,14 +1594,14 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
else if ( (LA12_0=='/') ) {
switch ( input.LA(2) ) {
- case '/':
+ case '*':
{
- alt12=35;
+ alt12=34;
}
break;
- case '*':
+ case '/':
{
- alt12=34;
+ alt12=35;
}
break;
default:
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java
index 61df8a8..314fcae 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'grammar'", "'extends'", "'hidden'", "'('", "','", "')'", "'.'", "'generate'", "'as'", "'import'", "'returns'", "':'", "';'", "'terminal'", "'::'", "'|'", "'?'", "'*'", "'+'", "'+='", "'='", "'?='", "'{'", "'current'", "'}'", "'!'", "'->'", "'..'", "'['", "']'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'grammar'", "'with'", "','", "'hidden'", "'('", "')'", "'.'", "'generate'", "'as'", "'import'", "'returns'", "':'", "';'", "'terminal'", "'::'", "'|'", "'?'", "'*'", "'+'", "'+='", "'='", "'?='", "'{'", "'current'", "'}'", "'!'", "'->'", "'..'", "'['", "']'"
};
public static final int RULE_ML_COMMENT=7;
public static final int RULE_ID=4;
@@ -100,35 +100,35 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleGrammar
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:77:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* ) (lv_rules_11= ruleAbstractRule )+ ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:77:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* ) (lv_rules_13= ruleAbstractRule )+ ) ;
public final EObject ruleGrammar() throws RecognitionException {
EObject current = null;
- Token lv_definesHiddenTokens_4=null;
+ Token lv_definesHiddenTokens_6=null;
AntlrDatatypeRuleToken lv_name_1 = null;
- EObject lv_metamodelDeclarations_10 = null;
+ EObject lv_metamodelDeclarations_12 = null;
- EObject lv_rules_11 = null;
+ EObject lv_rules_13 = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:82:6: ( ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* ) (lv_rules_11= ruleAbstractRule )+ ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* ) (lv_rules_11= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:82:6: ( ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* ) (lv_rules_13= ruleAbstractRule )+ ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* ) (lv_rules_13= ruleAbstractRule )+ )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* ) (lv_rules_11= ruleAbstractRule )+ )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* ) (lv_rules_11= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:1: ( ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* ) (lv_rules_13= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* ) (lv_rules_13= ruleAbstractRule )+
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:2: ( ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )*
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? ) ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:3: ( ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? ) ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( 'extends' ( ruleGrammarID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:4: ( ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( 'grammar' (lv_name_1= ruleGrammarID ) ) ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )?
{
// ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:5: ( 'grammar' (lv_name_1= ruleGrammarID ) )
// ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:83:6: 'grammar' (lv_name_1= ruleGrammarID )
@@ -166,20 +166,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:3: ( 'extends' ( ruleGrammarID ) )?
- int alt1=2;
- int LA1_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:3: ( ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )* )?
+ int alt2=2;
+ int LA2_0 = input.LA(1);
- if ( (LA1_0==12) ) {
- alt1=1;
+ if ( (LA2_0==12) ) {
+ alt2=1;
}
- switch (alt1) {
+ switch (alt2) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:4: 'extends' ( ruleGrammarID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:4: ( 'with' ( ruleGrammarID ) ) ( ',' ( ruleGrammarID ) )*
{
- match(input,12,FOLLOW_12_in_ruleGrammar168);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:4: ( 'with' ( ruleGrammarID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:108:5: 'with' ( ruleGrammarID )
+ {
+ match(input,12,FOLLOW_12_in_ruleGrammar169);
- createLeafNode(grammarAccess.prGrammar().ele00010KeywordExtends(), null);
+ createLeafNode(grammarAccess.prGrammar().ele000100KeywordWith(), null);
// ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:112:1: ( ruleGrammarID )
// ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:115:3: ruleGrammarID
@@ -191,9 +194,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- currentNode=createCompositeNode(grammarAccess.prGrammar().ele000110CrossReferenceEStringGrammar(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.prGrammar().ele0001010CrossReferenceEStringGrammar(), currentNode);
- pushFollow(FOLLOW_ruleGrammarID_in_ruleGrammar195);
+ pushFollow(FOLLOW_ruleGrammarID_in_ruleGrammar196);
ruleGrammarID();
_fsp--;
@@ -205,6 +208,59 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:3: ( ',' ( ruleGrammarID ) )*
+ loop1:
+ do {
+ int alt1=2;
+ int LA1_0 = input.LA(1);
+
+ if ( (LA1_0==13) ) {
+ alt1=1;
+ }
+
+
+ switch (alt1) {
+ case 1 :
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:4: ',' ( ruleGrammarID )
+ {
+ match(input,13,FOLLOW_13_in_ruleGrammar210);
+
+ createLeafNode(grammarAccess.prGrammar().ele000110KeywordComma(), null);
+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:134:1: ( ruleGrammarID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:137:3: ruleGrammarID
+ {
+
+ if (current==null) {
+ current = factory.create(grammarAccess.prGrammar().getRule().getType().getType());
+ associateNodeWithAstElement(currentNode, current);
+ }
+
+
+ currentNode=createCompositeNode(grammarAccess.prGrammar().ele0001110CrossReferenceEStringGrammar(), currentNode);
+
+ pushFollow(FOLLOW_ruleGrammarID_in_ruleGrammar237);
+ ruleGrammarID();
+ _fsp--;
+
+
+ currentNode = currentNode.getParent();
+
+
+ }
+
+
+ }
+ break;
+
+ default :
+ break loop1;
+ }
+ } while (true);
+
+
+ }
break;
}
@@ -212,28 +268,28 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:5: ( ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
- int alt4=2;
- int LA4_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:7: ( ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
+ int alt5=2;
+ int LA5_0 = input.LA(1);
- if ( (LA4_0==13) ) {
- alt4=1;
+ if ( (LA5_0==14) ) {
+ alt5=1;
}
- switch (alt4) {
+ switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:6: ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:8: ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:6: ( ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:7: ( (lv_definesHiddenTokens_4= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:8: ( ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:9: ( (lv_definesHiddenTokens_6= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:7: ( (lv_definesHiddenTokens_4= 'hidden' ) '(' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:8: (lv_definesHiddenTokens_4= 'hidden' ) '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:9: ( (lv_definesHiddenTokens_6= 'hidden' ) '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:10: (lv_definesHiddenTokens_6= 'hidden' ) '('
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:130:8: (lv_definesHiddenTokens_4= 'hidden' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:132:6: lv_definesHiddenTokens_4= 'hidden'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:152:10: (lv_definesHiddenTokens_6= 'hidden' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:154:6: lv_definesHiddenTokens_6= 'hidden'
{
- lv_definesHiddenTokens_4=(Token)input.LT(1);
- match(input,13,FOLLOW_13_in_ruleGrammar225);
+ lv_definesHiddenTokens_6=(Token)input.LT(1);
+ match(input,14,FOLLOW_14_in_ruleGrammar269);
createLeafNode(grammarAccess.prGrammar().ele0010000KeywordHidden(), "definesHiddenTokens");
@@ -252,26 +308,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,14,FOLLOW_14_in_ruleGrammar247);
+ match(input,15,FOLLOW_15_in_ruleGrammar291);
createLeafNode(grammarAccess.prGrammar().ele001001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:155:2: ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
- int alt3=2;
- int LA3_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:177:2: ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
+ int alt4=2;
+ int LA4_0 = input.LA(1);
- if ( (LA3_0==RULE_ID) ) {
- alt3=1;
+ if ( (LA4_0==RULE_ID) ) {
+ alt4=1;
}
- switch (alt3) {
+ switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:155:3: ( RULE_ID ) ( ',' ( RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:177:3: ( RULE_ID ) ( ',' ( RULE_ID ) )*
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:155:3: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:158:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:177:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:180:3: RULE_ID
{
if (current==null) {
@@ -279,34 +335,34 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar271);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar315);
createLeafNode(grammarAccess.prGrammar().ele0010100CrossReferenceEStringAbstractRule(), "hiddenTokens");
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:171:2: ( ',' ( RULE_ID ) )*
- loop2:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:193:2: ( ',' ( RULE_ID ) )*
+ loop3:
do {
- int alt2=2;
- int LA2_0 = input.LA(1);
+ int alt3=2;
+ int LA3_0 = input.LA(1);
- if ( (LA2_0==15) ) {
- alt2=1;
+ if ( (LA3_0==13) ) {
+ alt3=1;
}
- switch (alt2) {
+ switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:171:3: ',' ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:193:3: ',' ( RULE_ID )
{
- match(input,15,FOLLOW_15_in_ruleGrammar284);
+ match(input,13,FOLLOW_13_in_ruleGrammar328);
createLeafNode(grammarAccess.prGrammar().ele0010110KeywordComma(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:175:1: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:178:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:197:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:200:3: RULE_ID
{
if (current==null) {
@@ -314,7 +370,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar306);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar350);
createLeafNode(grammarAccess.prGrammar().ele00101110CrossReferenceEStringAbstractRule(), "hiddenTokens");
@@ -326,7 +382,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop2;
+ break loop3;
}
} while (true);
@@ -339,7 +395,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,16,FOLLOW_16_in_ruleGrammar323);
+ match(input,16,FOLLOW_16_in_ruleGrammar367);
createLeafNode(grammarAccess.prGrammar().ele0011KeywordRightParenthesis(), null);
@@ -352,26 +408,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:195:4: (lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration )*
- loop5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:217:4: (lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration )*
+ loop6:
do {
- int alt5=2;
- int LA5_0 = input.LA(1);
+ int alt6=2;
+ int LA6_0 = input.LA(1);
- if ( (LA5_0==18||LA5_0==20) ) {
- alt5=1;
+ if ( (LA6_0==18||LA6_0==20) ) {
+ alt6=1;
}
- switch (alt5) {
+ switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:198:6: lv_metamodelDeclarations_10= ruleAbstractMetamodelDeclaration
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:220:6: lv_metamodelDeclarations_12= ruleAbstractMetamodelDeclaration
{
currentNode=createCompositeNode(grammarAccess.prGrammar().ele010ParserRuleCallAbstractMetamodelDeclaration(), currentNode);
- pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_ruleGrammar360);
- lv_metamodelDeclarations_10=ruleAbstractMetamodelDeclaration();
+ pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_ruleGrammar404);
+ lv_metamodelDeclarations_12=ruleAbstractMetamodelDeclaration();
_fsp--;
@@ -381,7 +437,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
try {
- add(current, "metamodelDeclarations", lv_metamodelDeclarations_10, "AbstractMetamodelDeclaration", currentNode);
+ add(current, "metamodelDeclarations", lv_metamodelDeclarations_12, "AbstractMetamodelDeclaration", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -392,34 +448,34 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop5;
+ break loop6;
}
} while (true);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:216:4: (lv_rules_11= ruleAbstractRule )+
- int cnt6=0;
- loop6:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:238:4: (lv_rules_13= ruleAbstractRule )+
+ int cnt7=0;
+ loop7:
do {
- int alt6=2;
- int LA6_0 = input.LA(1);
+ int alt7=2;
+ int LA7_0 = input.LA(1);
- if ( (LA6_0==RULE_ID||LA6_0==24) ) {
- alt6=1;
+ if ( (LA7_0==RULE_ID||LA7_0==24) ) {
+ alt7=1;
}
- switch (alt6) {
+ switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:219:6: lv_rules_11= ruleAbstractRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:241:6: lv_rules_13= ruleAbstractRule
{
currentNode=createCompositeNode(grammarAccess.prGrammar().ele10ParserRuleCallAbstractRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractRule_in_ruleGrammar400);
- lv_rules_11=ruleAbstractRule();
+ pushFollow(FOLLOW_ruleAbstractRule_in_ruleGrammar444);
+ lv_rules_13=ruleAbstractRule();
_fsp--;
@@ -429,7 +485,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
try {
- add(current, "rules", lv_rules_11, "AbstractRule", currentNode);
+ add(current, "rules", lv_rules_13, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -440,12 +496,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- if ( cnt6 >= 1 ) break loop6;
+ if ( cnt7 >= 1 ) break loop7;
EarlyExitException eee =
- new EarlyExitException(6, input);
+ new EarlyExitException(7, input);
throw eee;
}
- cnt6++;
+ cnt7++;
} while (true);
@@ -471,7 +527,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleGrammarID
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:244:1: entryRuleGrammarID returns [String current=null] : iv_ruleGrammarID= ruleGrammarID EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:266:1: entryRuleGrammarID returns [String current=null] : iv_ruleGrammarID= ruleGrammarID EOF ;
public final String entryRuleGrammarID() throws RecognitionException {
String current = null;
@@ -479,16 +535,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:244:50: (iv_ruleGrammarID= ruleGrammarID EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:245:2: iv_ruleGrammarID= ruleGrammarID EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:266:50: (iv_ruleGrammarID= ruleGrammarID EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:267:2: iv_ruleGrammarID= ruleGrammarID EOF
{
currentNode = createCompositeNode(grammarAccess.prGrammarID().getRule(), currentNode);
- pushFollow(FOLLOW_ruleGrammarID_in_entryRuleGrammarID439);
+ pushFollow(FOLLOW_ruleGrammarID_in_entryRuleGrammarID483);
iv_ruleGrammarID=ruleGrammarID();
_fsp--;
current =iv_ruleGrammarID.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarID450);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarID494);
}
@@ -506,7 +562,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleGrammarID
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:252:1: ruleGrammarID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:274:1: ruleGrammarID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
public final AntlrDatatypeRuleToken ruleGrammarID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -517,43 +573,43 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:258:6: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:259:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:280:6: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:281:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:259:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:259:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:281:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:281:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
{
this_ID_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammarID490);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammarID534);
current.merge(this_ID_0);
createLeafNode(grammarAccess.prGrammarID().ele0TerminalRuleCallID(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:266:1: (kw= '.' this_ID_2= RULE_ID )*
- loop7:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:288:1: (kw= '.' this_ID_2= RULE_ID )*
+ loop8:
do {
- int alt7=2;
- int LA7_0 = input.LA(1);
+ int alt8=2;
+ int LA8_0 = input.LA(1);
- if ( (LA7_0==17) ) {
- alt7=1;
+ if ( (LA8_0==17) ) {
+ alt8=1;
}
- switch (alt7) {
+ switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:267:2: kw= '.' this_ID_2= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:289:2: kw= '.' this_ID_2= RULE_ID
{
kw=(Token)input.LT(1);
- match(input,17,FOLLOW_17_in_ruleGrammarID509);
+ match(input,17,FOLLOW_17_in_ruleGrammarID553);
current.merge(kw);
createLeafNode(grammarAccess.prGrammarID().ele10KeywordFullStop(), null);
this_ID_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammarID524);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammarID568);
current.merge(this_ID_2);
@@ -565,7 +621,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop7;
+ break loop8;
}
} while (true);
@@ -593,7 +649,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAbstractRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:287:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:309:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
public final EObject entryRuleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -601,16 +657,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:287:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:288:2: iv_ruleAbstractRule= ruleAbstractRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:309:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:310:2: iv_ruleAbstractRule= ruleAbstractRule EOF
{
currentNode = createCompositeNode(grammarAccess.prAbstractRule().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule569);
+ pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule613);
iv_ruleAbstractRule=ruleAbstractRule();
_fsp--;
current =iv_ruleAbstractRule;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractRule579);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractRule623);
}
@@ -628,7 +684,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAbstractRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:295:1: ruleAbstractRule returns [EObject current=null] : (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:317:1: ruleAbstractRule returns [EObject current=null] : (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule ) ;
public final EObject ruleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -640,33 +696,33 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:300:6: ( (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:301:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:322:6: ( (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:323:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:301:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )
- int alt8=2;
- int LA8_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:323:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )
+ int alt9=2;
+ int LA9_0 = input.LA(1);
- if ( (LA8_0==RULE_ID) ) {
- alt8=1;
+ if ( (LA9_0==RULE_ID) ) {
+ alt9=1;
}
- else if ( (LA8_0==24) ) {
- alt8=2;
+ else if ( (LA9_0==24) ) {
+ alt9=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("301:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )", 8, 0, input);
+ new NoViableAltException("323:1: (this_ParserRule_0= ruleParserRule | this_TerminalRule_1= ruleTerminalRule )", 9, 0, input);
throw nvae;
}
- switch (alt8) {
+ switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:302:5: this_ParserRule_0= ruleParserRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:324:5: this_ParserRule_0= ruleParserRule
{
currentNode=createCompositeNode(grammarAccess.prAbstractRule().ele0ParserRuleCallParserRule(), currentNode);
- pushFollow(FOLLOW_ruleParserRule_in_ruleAbstractRule626);
+ pushFollow(FOLLOW_ruleParserRule_in_ruleAbstractRule670);
this_ParserRule_0=ruleParserRule();
_fsp--;
@@ -681,12 +737,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:316:5: this_TerminalRule_1= ruleTerminalRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:338:5: this_TerminalRule_1= ruleTerminalRule
{
currentNode=createCompositeNode(grammarAccess.prAbstractRule().ele1ParserRuleCallTerminalRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalRule_in_ruleAbstractRule660);
+ pushFollow(FOLLOW_ruleTerminalRule_in_ruleAbstractRule704);
this_TerminalRule_1=ruleTerminalRule();
_fsp--;
@@ -723,7 +779,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAbstractMetamodelDeclaration
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:335:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:357:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ;
public final EObject entryRuleAbstractMetamodelDeclaration() throws RecognitionException {
EObject current = null;
@@ -731,16 +787,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:335:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:336:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:357:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:358:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF
{
currentNode = createCompositeNode(grammarAccess.prAbstractMetamodelDeclaration().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration699);
+ pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration743);
iv_ruleAbstractMetamodelDeclaration=ruleAbstractMetamodelDeclaration();
_fsp--;
current =iv_ruleAbstractMetamodelDeclaration;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractMetamodelDeclaration709);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractMetamodelDeclaration753);
}
@@ -758,7 +814,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAbstractMetamodelDeclaration
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:343:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:365:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel ) ;
public final EObject ruleAbstractMetamodelDeclaration() throws RecognitionException {
EObject current = null;
@@ -770,33 +826,33 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:348:6: ( (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:349:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:370:6: ( (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:371:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:349:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )
- int alt9=2;
- int LA9_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:371:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )
+ int alt10=2;
+ int LA10_0 = input.LA(1);
- if ( (LA9_0==18) ) {
- alt9=1;
+ if ( (LA10_0==18) ) {
+ alt10=1;
}
- else if ( (LA9_0==20) ) {
- alt9=2;
+ else if ( (LA10_0==20) ) {
+ alt10=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("349:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )", 9, 0, input);
+ new NoViableAltException("371:1: (this_GeneratedMetamodel_0= ruleGeneratedMetamodel | this_ReferencedMetamodel_1= ruleReferencedMetamodel )", 10, 0, input);
throw nvae;
}
- switch (alt9) {
+ switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:350:5: this_GeneratedMetamodel_0= ruleGeneratedMetamodel
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:372:5: this_GeneratedMetamodel_0= ruleGeneratedMetamodel
{
currentNode=createCompositeNode(grammarAccess.prAbstractMetamodelDeclaration().ele0ParserRuleCallGeneratedMetamodel(), currentNode);
- pushFollow(FOLLOW_ruleGeneratedMetamodel_in_ruleAbstractMetamodelDeclaration756);
+ pushFollow(FOLLOW_ruleGeneratedMetamodel_in_ruleAbstractMetamodelDeclaration800);
this_GeneratedMetamodel_0=ruleGeneratedMetamodel();
_fsp--;
@@ -811,12 +867,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:364:5: this_ReferencedMetamodel_1= ruleReferencedMetamodel
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:386:5: this_ReferencedMetamodel_1= ruleReferencedMetamodel
{
currentNode=createCompositeNode(grammarAccess.prAbstractMetamodelDeclaration().ele1ParserRuleCallReferencedMetamodel(), currentNode);
- pushFollow(FOLLOW_ruleReferencedMetamodel_in_ruleAbstractMetamodelDeclaration790);
+ pushFollow(FOLLOW_ruleReferencedMetamodel_in_ruleAbstractMetamodelDeclaration834);
this_ReferencedMetamodel_1=ruleReferencedMetamodel();
_fsp--;
@@ -853,7 +909,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleGeneratedMetamodel
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:383:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:405:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ;
public final EObject entryRuleGeneratedMetamodel() throws RecognitionException {
EObject current = null;
@@ -861,16 +917,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:383:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:384:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:405:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:406:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF
{
currentNode = createCompositeNode(grammarAccess.prGeneratedMetamodel().getRule(), currentNode);
- pushFollow(FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel829);
+ pushFollow(FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel873);
iv_ruleGeneratedMetamodel=ruleGeneratedMetamodel();
_fsp--;
current =iv_ruleGeneratedMetamodel;
- match(input,EOF,FOLLOW_EOF_in_entryRuleGeneratedMetamodel839);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleGeneratedMetamodel883);
}
@@ -888,7 +944,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleGeneratedMetamodel
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:391:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:413:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? ) ;
public final EObject ruleGeneratedMetamodel() throws RecognitionException {
EObject current = null;
@@ -898,27 +954,27 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:396:6: ( ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:1: ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:418:6: ( ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:1: ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:1: ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:2: ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:1: ( ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:2: ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) ) ( 'as' (lv_alias_4= RULE_ID ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:2: ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:3: ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:2: ( ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:3: ( 'generate' (lv_name_1= RULE_ID ) ) ( RULE_STRING )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:3: ( 'generate' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:397:4: 'generate' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:3: ( 'generate' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:419:4: 'generate' (lv_name_1= RULE_ID )
{
- match(input,18,FOLLOW_18_in_ruleGeneratedMetamodel875);
+ match(input,18,FOLLOW_18_in_ruleGeneratedMetamodel919);
createLeafNode(grammarAccess.prGeneratedMetamodel().ele000KeywordGenerate(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:401:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:403:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:423:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:425:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel897);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel941);
createLeafNode(grammarAccess.prGeneratedMetamodel().ele0010TerminalRuleCallID(), "name");
@@ -940,8 +996,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:421:3: ( RULE_STRING )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:424:3: RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:443:3: ( RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:446:3: RULE_STRING
{
if (current==null) {
@@ -949,7 +1005,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel928);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel972);
createLeafNode(grammarAccess.prGeneratedMetamodel().ele010CrossReferenceEStringEPackage(), "ePackage");
@@ -959,26 +1015,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:437:3: ( 'as' (lv_alias_4= RULE_ID ) )?
- int alt10=2;
- int LA10_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:459:3: ( 'as' (lv_alias_4= RULE_ID ) )?
+ int alt11=2;
+ int LA11_0 = input.LA(1);
- if ( (LA10_0==19) ) {
- alt10=1;
+ if ( (LA11_0==19) ) {
+ alt11=1;
}
- switch (alt10) {
+ switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:437:4: 'as' (lv_alias_4= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:459:4: 'as' (lv_alias_4= RULE_ID )
{
- match(input,19,FOLLOW_19_in_ruleGeneratedMetamodel942);
+ match(input,19,FOLLOW_19_in_ruleGeneratedMetamodel986);
createLeafNode(grammarAccess.prGeneratedMetamodel().ele10KeywordAs(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:441:1: (lv_alias_4= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:443:6: lv_alias_4= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:463:1: (lv_alias_4= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:465:6: lv_alias_4= RULE_ID
{
lv_alias_4=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel964);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel1008);
createLeafNode(grammarAccess.prGeneratedMetamodel().ele110TerminalRuleCallID(), "alias");
@@ -1026,7 +1082,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleReferencedMetamodel
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:468:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:490:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ;
public final EObject entryRuleReferencedMetamodel() throws RecognitionException {
EObject current = null;
@@ -1034,16 +1090,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:468:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:469:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:490:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:491:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF
{
currentNode = createCompositeNode(grammarAccess.prReferencedMetamodel().getRule(), currentNode);
- pushFollow(FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel1007);
+ pushFollow(FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel1051);
iv_ruleReferencedMetamodel=ruleReferencedMetamodel();
_fsp--;
current =iv_ruleReferencedMetamodel;
- match(input,EOF,FOLLOW_EOF_in_entryRuleReferencedMetamodel1017);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleReferencedMetamodel1061);
}
@@ -1061,7 +1117,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleReferencedMetamodel
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:476:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:498:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? ) ;
public final EObject ruleReferencedMetamodel() throws RecognitionException {
EObject current = null;
@@ -1070,21 +1126,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:481:6: ( ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:482:1: ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:503:6: ( ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:504:1: ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:482:1: ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:482:2: ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:504:1: ( ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:504:2: ( 'import' ( RULE_STRING ) ) ( 'as' (lv_alias_3= RULE_ID ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:482:2: ( 'import' ( RULE_STRING ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:482:3: 'import' ( RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:504:2: ( 'import' ( RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:504:3: 'import' ( RULE_STRING )
{
- match(input,20,FOLLOW_20_in_ruleReferencedMetamodel1052);
+ match(input,20,FOLLOW_20_in_ruleReferencedMetamodel1096);
createLeafNode(grammarAccess.prReferencedMetamodel().ele00KeywordImport(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:486:1: ( RULE_STRING )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:489:3: RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:508:1: ( RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:511:3: RULE_STRING
{
if (current==null) {
@@ -1092,7 +1148,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleReferencedMetamodel1074);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleReferencedMetamodel1118);
createLeafNode(grammarAccess.prReferencedMetamodel().ele010CrossReferenceEStringEPackage(), "ePackage");
@@ -1102,26 +1158,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:502:3: ( 'as' (lv_alias_3= RULE_ID ) )?
- int alt11=2;
- int LA11_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:524:3: ( 'as' (lv_alias_3= RULE_ID ) )?
+ int alt12=2;
+ int LA12_0 = input.LA(1);
- if ( (LA11_0==19) ) {
- alt11=1;
+ if ( (LA12_0==19) ) {
+ alt12=1;
}
- switch (alt11) {
+ switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:502:4: 'as' (lv_alias_3= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:524:4: 'as' (lv_alias_3= RULE_ID )
{
- match(input,19,FOLLOW_19_in_ruleReferencedMetamodel1088);
+ match(input,19,FOLLOW_19_in_ruleReferencedMetamodel1132);
createLeafNode(grammarAccess.prReferencedMetamodel().ele10KeywordAs(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:506:1: (lv_alias_3= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:508:6: lv_alias_3= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:528:1: (lv_alias_3= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:530:6: lv_alias_3= RULE_ID
{
lv_alias_3=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReferencedMetamodel1110);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReferencedMetamodel1154);
createLeafNode(grammarAccess.prReferencedMetamodel().ele110TerminalRuleCallID(), "alias");
@@ -1169,7 +1225,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleParserRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:533:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:555:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ;
public final EObject entryRuleParserRule() throws RecognitionException {
EObject current = null;
@@ -1177,16 +1233,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:533:52: (iv_ruleParserRule= ruleParserRule EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:534:2: iv_ruleParserRule= ruleParserRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:555:52: (iv_ruleParserRule= ruleParserRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:556:2: iv_ruleParserRule= ruleParserRule EOF
{
currentNode = createCompositeNode(grammarAccess.prParserRule().getRule(), currentNode);
- pushFollow(FOLLOW_ruleParserRule_in_entryRuleParserRule1153);
+ pushFollow(FOLLOW_ruleParserRule_in_entryRuleParserRule1197);
iv_ruleParserRule=ruleParserRule();
_fsp--;
current =iv_ruleParserRule;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParserRule1163);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParserRule1207);
}
@@ -1204,7 +1260,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleParserRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:541:1: ruleParserRule returns [EObject current=null] : ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:563:1: ruleParserRule returns [EObject current=null] : ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' ) ;
public final EObject ruleParserRule() throws RecognitionException {
EObject current = null;
@@ -1218,29 +1274,29 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:546:6: ( ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:1: ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:568:6: ( ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:1: ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:1: ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:2: ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:1: ( ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:2: ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) ) ';'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:2: ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:3: ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:2: ( ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:3: ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' ) (lv_alternatives_10= ruleAlternatives )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:3: ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:4: ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:3: ( ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:4: ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? ) ':'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:4: ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:5: ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:4: ( ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:5: ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? ) ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:5: ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:6: (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:5: ( (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:6: (lv_name_0= RULE_ID ) ( 'returns' (lv_type_2= ruleTypeRef ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:547:6: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:549:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:569:6: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:571:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1214);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1258);
createLeafNode(grammarAccess.prParserRule().ele000000TerminalRuleCallID(), "name");
@@ -1259,28 +1315,28 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:567:2: ( 'returns' (lv_type_2= ruleTypeRef ) )?
- int alt12=2;
- int LA12_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:589:2: ( 'returns' (lv_type_2= ruleTypeRef ) )?
+ int alt13=2;
+ int LA13_0 = input.LA(1);
- if ( (LA12_0==21) ) {
- alt12=1;
+ if ( (LA13_0==21) ) {
+ alt13=1;
}
- switch (alt12) {
+ switch (alt13) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:567:3: 'returns' (lv_type_2= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:589:3: 'returns' (lv_type_2= ruleTypeRef )
{
- match(input,21,FOLLOW_21_in_ruleParserRule1232);
+ match(input,21,FOLLOW_21_in_ruleParserRule1276);
createLeafNode(grammarAccess.prParserRule().ele000010KeywordReturns(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:571:1: (lv_type_2= ruleTypeRef )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:574:6: lv_type_2= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:593:1: (lv_type_2= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:596:6: lv_type_2= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prParserRule().ele0000110ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleParserRule1266);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleParserRule1310);
lv_type_2=ruleTypeRef();
_fsp--;
@@ -1309,28 +1365,28 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:5: ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
- int alt15=2;
- int LA15_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:5: ( ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')' )?
+ int alt16=2;
+ int LA16_0 = input.LA(1);
- if ( (LA15_0==13) ) {
- alt15=1;
+ if ( (LA16_0==14) ) {
+ alt16=1;
}
- switch (alt15) {
+ switch (alt16) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:6: ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:6: ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? ) ')'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:6: ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:7: ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:6: ( ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:7: ( (lv_definesHiddenTokens_3= 'hidden' ) '(' ) ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:7: ( (lv_definesHiddenTokens_3= 'hidden' ) '(' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:8: (lv_definesHiddenTokens_3= 'hidden' ) '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:7: ( (lv_definesHiddenTokens_3= 'hidden' ) '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:8: (lv_definesHiddenTokens_3= 'hidden' ) '('
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:592:8: (lv_definesHiddenTokens_3= 'hidden' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:594:6: lv_definesHiddenTokens_3= 'hidden'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:614:8: (lv_definesHiddenTokens_3= 'hidden' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:616:6: lv_definesHiddenTokens_3= 'hidden'
{
lv_definesHiddenTokens_3=(Token)input.LT(1);
- match(input,13,FOLLOW_13_in_ruleParserRule1297);
+ match(input,14,FOLLOW_14_in_ruleParserRule1341);
createLeafNode(grammarAccess.prParserRule().ele00010000KeywordHidden(), "definesHiddenTokens");
@@ -1349,26 +1405,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,14,FOLLOW_14_in_ruleParserRule1319);
+ match(input,15,FOLLOW_15_in_ruleParserRule1363);
createLeafNode(grammarAccess.prParserRule().ele0001001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:617:2: ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
- int alt14=2;
- int LA14_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:639:2: ( ( RULE_ID ) ( ',' ( RULE_ID ) )* )?
+ int alt15=2;
+ int LA15_0 = input.LA(1);
- if ( (LA14_0==RULE_ID) ) {
- alt14=1;
+ if ( (LA15_0==RULE_ID) ) {
+ alt15=1;
}
- switch (alt14) {
+ switch (alt15) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:617:3: ( RULE_ID ) ( ',' ( RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:639:3: ( RULE_ID ) ( ',' ( RULE_ID ) )*
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:617:3: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:620:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:639:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:642:3: RULE_ID
{
if (current==null) {
@@ -1376,34 +1432,34 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1343);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1387);
createLeafNode(grammarAccess.prParserRule().ele00010100CrossReferenceEStringAbstractRule(), "hiddenTokens");
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:633:2: ( ',' ( RULE_ID ) )*
- loop13:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:655:2: ( ',' ( RULE_ID ) )*
+ loop14:
do {
- int alt13=2;
- int LA13_0 = input.LA(1);
+ int alt14=2;
+ int LA14_0 = input.LA(1);
- if ( (LA13_0==15) ) {
- alt13=1;
+ if ( (LA14_0==13) ) {
+ alt14=1;
}
- switch (alt13) {
+ switch (alt14) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:633:3: ',' ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:655:3: ',' ( RULE_ID )
{
- match(input,15,FOLLOW_15_in_ruleParserRule1356);
+ match(input,13,FOLLOW_13_in_ruleParserRule1400);
createLeafNode(grammarAccess.prParserRule().ele00010110KeywordComma(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:637:1: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:640:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:659:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:662:3: RULE_ID
{
if (current==null) {
@@ -1411,7 +1467,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1378);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1422);
createLeafNode(grammarAccess.prParserRule().ele000101110CrossReferenceEStringAbstractRule(), "hiddenTokens");
@@ -1423,7 +1479,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop13;
+ break loop14;
}
} while (true);
@@ -1436,7 +1492,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,16,FOLLOW_16_in_ruleParserRule1395);
+ match(input,16,FOLLOW_16_in_ruleParserRule1439);
createLeafNode(grammarAccess.prParserRule().ele00011KeywordRightParenthesis(), null);
@@ -1449,20 +1505,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,22,FOLLOW_22_in_ruleParserRule1407);
+ match(input,22,FOLLOW_22_in_ruleParserRule1451);
createLeafNode(grammarAccess.prParserRule().ele001KeywordColon(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:661:2: (lv_alternatives_10= ruleAlternatives )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:664:6: lv_alternatives_10= ruleAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:683:2: (lv_alternatives_10= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:686:6: lv_alternatives_10= ruleAlternatives
{
currentNode=createCompositeNode(grammarAccess.prParserRule().ele010ParserRuleCallAlternatives(), currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_ruleParserRule1442);
+ pushFollow(FOLLOW_ruleAlternatives_in_ruleParserRule1486);
lv_alternatives_10=ruleAlternatives();
_fsp--;
@@ -1485,7 +1541,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,23,FOLLOW_23_in_ruleParserRule1456);
+ match(input,23,FOLLOW_23_in_ruleParserRule1500);
createLeafNode(grammarAccess.prParserRule().ele1KeywordSemicolon(), null);
@@ -1512,7 +1568,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTerminalRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:693:1: entryRuleTerminalRule returns [EObject current=null] : iv_ruleTerminalRule= ruleTerminalRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:715:1: entryRuleTerminalRule returns [EObject current=null] : iv_ruleTerminalRule= ruleTerminalRule EOF ;
public final EObject entryRuleTerminalRule() throws RecognitionException {
EObject current = null;
@@ -1520,16 +1576,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:693:54: (iv_ruleTerminalRule= ruleTerminalRule EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:694:2: iv_ruleTerminalRule= ruleTerminalRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:715:54: (iv_ruleTerminalRule= ruleTerminalRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:716:2: iv_ruleTerminalRule= ruleTerminalRule EOF
{
currentNode = createCompositeNode(grammarAccess.prTerminalRule().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1489);
+ pushFollow(FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1533);
iv_ruleTerminalRule=ruleTerminalRule();
_fsp--;
current =iv_ruleTerminalRule;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalRule1499);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalRule1543);
}
@@ -1547,7 +1603,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTerminalRule
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:701:1: ruleTerminalRule returns [EObject current=null] : ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:723:1: ruleTerminalRule returns [EObject current=null] : ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' ) ;
public final EObject ruleTerminalRule() throws RecognitionException {
EObject current = null;
@@ -1560,33 +1616,33 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:706:6: ( ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:1: ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:728:6: ( ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:1: ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:1: ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:2: ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:1: ( ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:2: ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) ) ';'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:2: ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:3: ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:2: ( ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:3: ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' ) (lv_alternatives_5= ruleTerminalAlternatives )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:3: ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:4: ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:3: ( ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:4: ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? ) ':'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:4: ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:5: ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:4: ( ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:5: ( 'terminal' (lv_name_1= RULE_ID ) ) ( 'returns' (lv_type_3= ruleTypeRef ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:5: ( 'terminal' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:707:6: 'terminal' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:5: ( 'terminal' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:729:6: 'terminal' (lv_name_1= RULE_ID )
{
- match(input,24,FOLLOW_24_in_ruleTerminalRule1537);
+ match(input,24,FOLLOW_24_in_ruleTerminalRule1581);
createLeafNode(grammarAccess.prTerminalRule().ele00000KeywordTerminal(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:711:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:713:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:733:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:735:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTerminalRule1559);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTerminalRule1603);
createLeafNode(grammarAccess.prTerminalRule().ele000010TerminalRuleCallID(), "name");
@@ -1608,28 +1664,28 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:731:3: ( 'returns' (lv_type_3= ruleTypeRef ) )?
- int alt16=2;
- int LA16_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:753:3: ( 'returns' (lv_type_3= ruleTypeRef ) )?
+ int alt17=2;
+ int LA17_0 = input.LA(1);
- if ( (LA16_0==21) ) {
- alt16=1;
+ if ( (LA17_0==21) ) {
+ alt17=1;
}
- switch (alt16) {
+ switch (alt17) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:731:4: 'returns' (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:753:4: 'returns' (lv_type_3= ruleTypeRef )
{
- match(input,21,FOLLOW_21_in_ruleTerminalRule1578);
+ match(input,21,FOLLOW_21_in_ruleTerminalRule1622);
createLeafNode(grammarAccess.prTerminalRule().ele00010KeywordReturns(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:735:1: (lv_type_3= ruleTypeRef )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:738:6: lv_type_3= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:757:1: (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:760:6: lv_type_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prTerminalRule().ele000110ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleTerminalRule1612);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleTerminalRule1656);
lv_type_3=ruleTypeRef();
_fsp--;
@@ -1658,20 +1714,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,22,FOLLOW_22_in_ruleTerminalRule1628);
+ match(input,22,FOLLOW_22_in_ruleTerminalRule1672);
createLeafNode(grammarAccess.prTerminalRule().ele001KeywordColon(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:760:2: (lv_alternatives_5= ruleTerminalAlternatives )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:763:6: lv_alternatives_5= ruleTerminalAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:782:2: (lv_alternatives_5= ruleTerminalAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:785:6: lv_alternatives_5= ruleTerminalAlternatives
{
currentNode=createCompositeNode(grammarAccess.prTerminalRule().ele010ParserRuleCallTerminalAlternatives(), currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1663);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1707);
lv_alternatives_5=ruleTerminalAlternatives();
_fsp--;
@@ -1694,7 +1750,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,23,FOLLOW_23_in_ruleTerminalRule1677);
+ match(input,23,FOLLOW_23_in_ruleTerminalRule1721);
createLeafNode(grammarAccess.prTerminalRule().ele1KeywordSemicolon(), null);
@@ -1721,7 +1777,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTypeRef
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:792:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:814:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
public final EObject entryRuleTypeRef() throws RecognitionException {
EObject current = null;
@@ -1729,16 +1785,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:792:49: (iv_ruleTypeRef= ruleTypeRef EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:793:2: iv_ruleTypeRef= ruleTypeRef EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:814:49: (iv_ruleTypeRef= ruleTypeRef EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:815:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1710);
+ pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1754);
iv_ruleTypeRef=ruleTypeRef();
_fsp--;
current =iv_ruleTypeRef;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef1720);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef1764);
}
@@ -1756,36 +1812,36 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTypeRef
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:800:1: ruleTypeRef returns [EObject current=null] : ( ( ( RULE_ID ) '::' )? ( RULE_ID ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:822:1: ruleTypeRef returns [EObject current=null] : ( ( ( RULE_ID ) '::' )? ( RULE_ID ) ) ;
public final EObject ruleTypeRef() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:805:6: ( ( ( ( RULE_ID ) '::' )? ( RULE_ID ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:1: ( ( ( RULE_ID ) '::' )? ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:827:6: ( ( ( ( RULE_ID ) '::' )? ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:1: ( ( ( RULE_ID ) '::' )? ( RULE_ID ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:1: ( ( ( RULE_ID ) '::' )? ( RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:2: ( ( RULE_ID ) '::' )? ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:1: ( ( ( RULE_ID ) '::' )? ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:2: ( ( RULE_ID ) '::' )? ( RULE_ID )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:2: ( ( RULE_ID ) '::' )?
- int alt17=2;
- int LA17_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:2: ( ( RULE_ID ) '::' )?
+ int alt18=2;
+ int LA18_0 = input.LA(1);
- if ( (LA17_0==RULE_ID) ) {
- int LA17_1 = input.LA(2);
+ if ( (LA18_0==RULE_ID) ) {
+ int LA18_1 = input.LA(2);
- if ( (LA17_1==25) ) {
- alt17=1;
+ if ( (LA18_1==25) ) {
+ alt18=1;
}
}
- switch (alt17) {
+ switch (alt18) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:3: ( RULE_ID ) '::'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:3: ( RULE_ID ) '::'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:806:3: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:809:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:828:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:831:3: RULE_ID
{
if (current==null) {
@@ -1793,14 +1849,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1768);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1812);
createLeafNode(grammarAccess.prTypeRef().ele000CrossReferenceEStringAbstractMetamodelDeclaration(), "metamodel");
}
- match(input,25,FOLLOW_25_in_ruleTypeRef1780);
+ match(input,25,FOLLOW_25_in_ruleTypeRef1824);
createLeafNode(grammarAccess.prTypeRef().ele01KeywordColonColon(), null);
@@ -1810,8 +1866,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:826:3: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:829:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:848:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:851:3: RULE_ID
{
if (current==null) {
@@ -1819,7 +1875,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1804);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1848);
createLeafNode(grammarAccess.prTypeRef().ele10CrossReferenceEStringEClassifier(), "type");
@@ -1849,7 +1905,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAlternatives
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:849:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:871:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ;
public final EObject entryRuleAlternatives() throws RecognitionException {
EObject current = null;
@@ -1857,16 +1913,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:849:54: (iv_ruleAlternatives= ruleAlternatives EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:850:2: iv_ruleAlternatives= ruleAlternatives EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:871:54: (iv_ruleAlternatives= ruleAlternatives EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:872:2: iv_ruleAlternatives= ruleAlternatives EOF
{
currentNode = createCompositeNode(grammarAccess.prAlternatives().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives1840);
+ pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives1884);
iv_ruleAlternatives=ruleAlternatives();
_fsp--;
current =iv_ruleAlternatives;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAlternatives1850);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAlternatives1894);
}
@@ -1884,7 +1940,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAlternatives
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:857:1: ruleAlternatives returns [EObject current=null] : (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:879:1: ruleAlternatives returns [EObject current=null] : (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* ) ;
public final EObject ruleAlternatives() throws RecognitionException {
EObject current = null;
@@ -1896,16 +1952,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:862:6: ( (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:863:1: (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:884:6: ( (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:885:1: (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:863:1: (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:864:5: this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:885:1: (this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:886:5: this_Group_0= ruleGroup ( ( () '|' ) (lv_groups_3= ruleGroup ) )*
{
currentNode=createCompositeNode(grammarAccess.prAlternatives().ele0ParserRuleCallGroup(), currentNode);
- pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives1897);
+ pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives1941);
this_Group_0=ruleGroup();
_fsp--;
@@ -1916,26 +1972,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prAlternatives().ele0ParserRuleCallGroup(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:876:1: ( ( () '|' ) (lv_groups_3= ruleGroup ) )*
- loop18:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:898:1: ( ( () '|' ) (lv_groups_3= ruleGroup ) )*
+ loop19:
do {
- int alt18=2;
- int LA18_0 = input.LA(1);
+ int alt19=2;
+ int LA19_0 = input.LA(1);
- if ( (LA18_0==26) ) {
- alt18=1;
+ if ( (LA19_0==26) ) {
+ alt19=1;
}
- switch (alt18) {
+ switch (alt19) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:876:2: ( () '|' ) (lv_groups_3= ruleGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:898:2: ( () '|' ) (lv_groups_3= ruleGroup )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:876:2: ( () '|' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:876:3: () '|'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:898:2: ( () '|' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:898:3: () '|'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:876:3: ()
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:877:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:898:3: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:899:5:
{
temp=factory.create(grammarAccess.prAlternatives().ele100ActionAlternativesgroups().getTypeName().getType());
@@ -1955,20 +2011,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,26,FOLLOW_26_in_ruleAlternatives1923);
+ match(input,26,FOLLOW_26_in_ruleAlternatives1967);
createLeafNode(grammarAccess.prAlternatives().ele101KeywordVerticalLine(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:896:2: (lv_groups_3= ruleGroup )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:899:6: lv_groups_3= ruleGroup
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:918:2: (lv_groups_3= ruleGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:921:6: lv_groups_3= ruleGroup
{
currentNode=createCompositeNode(grammarAccess.prAlternatives().ele110ParserRuleCallGroup(), currentNode);
- pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives1958);
+ pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives2002);
lv_groups_3=ruleGroup();
_fsp--;
@@ -1993,7 +2049,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop18;
+ break loop19;
}
} while (true);
@@ -2020,7 +2076,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTerminalAlternatives
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:924:1: entryRuleTerminalAlternatives returns [EObject current=null] : iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:946:1: entryRuleTerminalAlternatives returns [EObject current=null] : iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF ;
public final EObject entryRuleTerminalAlternatives() throws RecognitionException {
EObject current = null;
@@ -2028,16 +2084,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:924:62: (iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:925:2: iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:946:62: (iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:947:2: iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF
{
currentNode = createCompositeNode(grammarAccess.prTerminalAlternatives().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives1997);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2041);
iv_ruleTerminalAlternatives=ruleTerminalAlternatives();
_fsp--;
current =iv_ruleTerminalAlternatives;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalAlternatives2007);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalAlternatives2051);
}
@@ -2055,7 +2111,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTerminalAlternatives
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:932:1: ruleTerminalAlternatives returns [EObject current=null] : (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:954:1: ruleTerminalAlternatives returns [EObject current=null] : (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* ) ;
public final EObject ruleTerminalAlternatives() throws RecognitionException {
EObject current = null;
@@ -2067,16 +2123,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:937:6: ( (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:938:1: (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:959:6: ( (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:960:1: (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:938:1: (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:939:5: this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:960:1: (this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:961:5: this_TerminalGroup_0= ruleTerminalGroup ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )*
{
currentNode=createCompositeNode(grammarAccess.prTerminalAlternatives().ele0ParserRuleCallTerminalGroup(), currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2054);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2098);
this_TerminalGroup_0=ruleTerminalGroup();
_fsp--;
@@ -2087,26 +2143,26 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prTerminalAlternatives().ele0ParserRuleCallTerminalGroup(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:951:1: ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )*
- loop19:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:973:1: ( ( () '|' ) (lv_groups_3= ruleTerminalGroup ) )*
+ loop20:
do {
- int alt19=2;
- int LA19_0 = input.LA(1);
+ int alt20=2;
+ int LA20_0 = input.LA(1);
- if ( (LA19_0==26) ) {
- alt19=1;
+ if ( (LA20_0==26) ) {
+ alt20=1;
}
- switch (alt19) {
+ switch (alt20) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:951:2: ( () '|' ) (lv_groups_3= ruleTerminalGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:973:2: ( () '|' ) (lv_groups_3= ruleTerminalGroup )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:951:2: ( () '|' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:951:3: () '|'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:973:2: ( () '|' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:973:3: () '|'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:951:3: ()
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:952:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:973:3: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:974:5:
{
temp=factory.create(grammarAccess.prTerminalAlternatives().ele100ActionAlternativesgroups().getTypeName().getType());
@@ -2126,20 +2182,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,26,FOLLOW_26_in_ruleTerminalAlternatives2080);
+ match(input,26,FOLLOW_26_in_ruleTerminalAlternatives2124);
createLeafNode(grammarAccess.prTerminalAlternatives().ele101KeywordVerticalLine(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:971:2: (lv_groups_3= ruleTerminalGroup )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:974:6: lv_groups_3= ruleTerminalGroup
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:993:2: (lv_groups_3= ruleTerminalGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:996:6: lv_groups_3= ruleTerminalGroup
{
currentNode=createCompositeNode(grammarAccess.prTerminalAlternatives().ele110ParserRuleCallTerminalGroup(), currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2115);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2159);
lv_groups_3=ruleTerminalGroup();
_fsp--;
@@ -2164,7 +2220,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop19;
+ break loop20;
}
} while (true);
@@ -2191,7 +2247,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleGroup
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:999:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1021:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ;
public final EObject entryRuleGroup() throws RecognitionException {
EObject current = null;
@@ -2199,16 +2255,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:999:47: (iv_ruleGroup= ruleGroup EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1000:2: iv_ruleGroup= ruleGroup EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1021:47: (iv_ruleGroup= ruleGroup EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1022:2: iv_ruleGroup= ruleGroup EOF
{
currentNode = createCompositeNode(grammarAccess.prGroup().getRule(), currentNode);
- pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup2154);
+ pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup2198);
iv_ruleGroup=ruleGroup();
_fsp--;
current =iv_ruleGroup;
- match(input,EOF,FOLLOW_EOF_in_entryRuleGroup2164);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleGroup2208);
}
@@ -2226,7 +2282,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleGroup
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1007:1: ruleGroup returns [EObject current=null] : (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1029:1: ruleGroup returns [EObject current=null] : (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* ) ;
public final EObject ruleGroup() throws RecognitionException {
EObject current = null;
@@ -2238,16 +2294,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1012:6: ( (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1013:1: (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1034:6: ( (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1035:1: (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1013:1: (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1014:5: this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1035:1: (this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1036:5: this_AbstractToken_0= ruleAbstractToken ( () (lv_abstractTokens_2= ruleAbstractToken ) )*
{
currentNode=createCompositeNode(grammarAccess.prGroup().ele0ParserRuleCallAbstractToken(), currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2211);
+ pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2255);
this_AbstractToken_0=ruleAbstractToken();
_fsp--;
@@ -2258,23 +2314,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prGroup().ele0ParserRuleCallAbstractToken(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1026:1: ( () (lv_abstractTokens_2= ruleAbstractToken ) )*
- loop20:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1048:1: ( () (lv_abstractTokens_2= ruleAbstractToken ) )*
+ loop21:
do {
- int alt20=2;
- int LA20_0 = input.LA(1);
+ int alt21=2;
+ int LA21_0 = input.LA(1);
- if ( ((LA20_0>=RULE_ID && LA20_0<=RULE_STRING)||LA20_0==14||LA20_0==33||LA20_0==39) ) {
- alt20=1;
+ if ( ((LA21_0>=RULE_ID && LA21_0<=RULE_STRING)||LA21_0==15||LA21_0==33||LA21_0==39) ) {
+ alt21=1;
}
- switch (alt20) {
+ switch (alt21) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1026:2: () (lv_abstractTokens_2= ruleAbstractToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1048:2: () (lv_abstractTokens_2= ruleAbstractToken )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1026:2: ()
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1027:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1048:2: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1049:5:
{
temp=factory.create(grammarAccess.prGroup().ele10ActionGroupabstractTokens().getTypeName().getType());
@@ -2294,13 +2350,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1042:2: (lv_abstractTokens_2= ruleAbstractToken )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1045:6: lv_abstractTokens_2= ruleAbstractToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1064:2: (lv_abstractTokens_2= ruleAbstractToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1067:6: lv_abstractTokens_2= ruleAbstractToken
{
currentNode=createCompositeNode(grammarAccess.prGroup().ele110ParserRuleCallAbstractToken(), currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2261);
+ pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2305);
lv_abstractTokens_2=ruleAbstractToken();
_fsp--;
@@ -2325,7 +2381,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop20;
+ break loop21;
}
} while (true);
@@ -2352,7 +2408,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTerminalGroup
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1070:1: entryRuleTerminalGroup returns [EObject current=null] : iv_ruleTerminalGroup= ruleTerminalGroup EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1092:1: entryRuleTerminalGroup returns [EObject current=null] : iv_ruleTerminalGroup= ruleTerminalGroup EOF ;
public final EObject entryRuleTerminalGroup() throws RecognitionException {
EObject current = null;
@@ -2360,16 +2416,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1070:55: (iv_ruleTerminalGroup= ruleTerminalGroup EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1071:2: iv_ruleTerminalGroup= ruleTerminalGroup EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1092:55: (iv_ruleTerminalGroup= ruleTerminalGroup EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1093:2: iv_ruleTerminalGroup= ruleTerminalGroup EOF
{
currentNode = createCompositeNode(grammarAccess.prTerminalGroup().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2300);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2344);
iv_ruleTerminalGroup=ruleTerminalGroup();
_fsp--;
current =iv_ruleTerminalGroup;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalGroup2310);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalGroup2354);
}
@@ -2387,7 +2443,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTerminalGroup
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1078:1: ruleTerminalGroup returns [EObject current=null] : (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1100:1: ruleTerminalGroup returns [EObject current=null] : (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* ) ;
public final EObject ruleTerminalGroup() throws RecognitionException {
EObject current = null;
@@ -2399,16 +2455,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1083:6: ( (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1084:1: (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1105:6: ( (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1106:1: (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1084:1: (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1085:5: this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1106:1: (this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1107:5: this_TerminalToken_0= ruleTerminalToken ( () (lv_abstractTokens_2= ruleTerminalToken ) )*
{
currentNode=createCompositeNode(grammarAccess.prTerminalGroup().ele0ParserRuleCallTerminalToken(), currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2357);
+ pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2401);
this_TerminalToken_0=ruleTerminalToken();
_fsp--;
@@ -2419,23 +2475,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prTerminalGroup().ele0ParserRuleCallTerminalToken(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1097:1: ( () (lv_abstractTokens_2= ruleTerminalToken ) )*
- loop21:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1119:1: ( () (lv_abstractTokens_2= ruleTerminalToken ) )*
+ loop22:
do {
- int alt21=2;
- int LA21_0 = input.LA(1);
+ int alt22=2;
+ int LA22_0 = input.LA(1);
- if ( ((LA21_0>=RULE_ID && LA21_0<=RULE_STRING)||LA21_0==14||LA21_0==17||(LA21_0>=36 && LA21_0<=37)) ) {
- alt21=1;
+ if ( ((LA22_0>=RULE_ID && LA22_0<=RULE_STRING)||LA22_0==15||LA22_0==17||(LA22_0>=36 && LA22_0<=37)) ) {
+ alt22=1;
}
- switch (alt21) {
+ switch (alt22) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1097:2: () (lv_abstractTokens_2= ruleTerminalToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1119:2: () (lv_abstractTokens_2= ruleTerminalToken )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1097:2: ()
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1098:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1119:2: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1120:5:
{
temp=factory.create(grammarAccess.prTerminalGroup().ele10ActionGroupabstractTokens().getTypeName().getType());
@@ -2455,13 +2511,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1113:2: (lv_abstractTokens_2= ruleTerminalToken )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1116:6: lv_abstractTokens_2= ruleTerminalToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1135:2: (lv_abstractTokens_2= ruleTerminalToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1138:6: lv_abstractTokens_2= ruleTerminalToken
{
currentNode=createCompositeNode(grammarAccess.prTerminalGroup().ele110ParserRuleCallTerminalToken(), currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2407);
+ pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2451);
lv_abstractTokens_2=ruleTerminalToken();
_fsp--;
@@ -2486,7 +2542,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
default :
- break loop21;
+ break loop22;
}
} while (true);
@@ -2513,7 +2569,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAbstractToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1141:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1163:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ;
public final EObject entryRuleAbstractToken() throws RecognitionException {
EObject current = null;
@@ -2521,16 +2577,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1141:55: (iv_ruleAbstractToken= ruleAbstractToken EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1142:2: iv_ruleAbstractToken= ruleAbstractToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1163:55: (iv_ruleAbstractToken= ruleAbstractToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1164:2: iv_ruleAbstractToken= ruleAbstractToken EOF
{
currentNode = createCompositeNode(grammarAccess.prAbstractToken().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2446);
+ pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2490);
iv_ruleAbstractToken=ruleAbstractToken();
_fsp--;
current =iv_ruleAbstractToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractToken2456);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractToken2500);
}
@@ -2548,7 +2604,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAbstractToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1149:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1171:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? ) ;
public final EObject ruleAbstractToken() throws RecognitionException {
EObject current = null;
@@ -2563,28 +2619,28 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1154:6: ( ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:1: ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1176:6: ( ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:1: ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:1: ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:1: ( ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal ) (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )
- int alt23=2;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )
+ int alt24=2;
switch ( input.LA(1) ) {
case RULE_ID:
{
- int LA23_1 = input.LA(2);
+ int LA24_1 = input.LA(2);
- if ( (LA23_1==EOF||(LA23_1>=RULE_ID && LA23_1<=RULE_STRING)||LA23_1==14||LA23_1==16||LA23_1==23||(LA23_1>=26 && LA23_1<=29)||LA23_1==33||LA23_1==39) ) {
- alt23=2;
+ if ( (LA24_1==EOF||(LA24_1>=RULE_ID && LA24_1<=RULE_STRING)||(LA24_1>=15 && LA24_1<=16)||LA24_1==23||(LA24_1>=26 && LA24_1<=29)||LA24_1==33||LA24_1==39) ) {
+ alt24=2;
}
- else if ( ((LA23_1>=30 && LA23_1<=32)) ) {
- alt23=1;
+ else if ( ((LA24_1>=30 && LA24_1<=32)) ) {
+ alt24=1;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1155:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )", 23, 1, input);
+ new NoViableAltException("1177:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )", 24, 1, input);
throw nvae;
}
@@ -2592,51 +2648,51 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
break;
case 33:
{
- alt23=1;
+ alt24=1;
}
break;
case RULE_STRING:
- case 14:
+ case 15:
case 39:
{
- alt23=2;
+ alt24=2;
}
break;
default:
NoViableAltException nvae =
- new NoViableAltException("1155:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )", 23, 0, input);
+ new NoViableAltException("1177:2: ( (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction ) | this_AbstractTerminal_2= ruleAbstractTerminal )", 24, 0, input);
throw nvae;
}
- switch (alt23) {
+ switch (alt24) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1155:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )
- int alt22=2;
- int LA22_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1177:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )
+ int alt23=2;
+ int LA23_0 = input.LA(1);
- if ( (LA22_0==RULE_ID) ) {
- alt22=1;
+ if ( (LA23_0==RULE_ID) ) {
+ alt23=1;
}
- else if ( (LA22_0==33) ) {
- alt22=2;
+ else if ( (LA23_0==33) ) {
+ alt23=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1155:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )", 22, 0, input);
+ new NoViableAltException("1177:3: (this_Assignment_0= ruleAssignment | this_Action_1= ruleAction )", 23, 0, input);
throw nvae;
}
- switch (alt22) {
+ switch (alt23) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1156:5: this_Assignment_0= ruleAssignment
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1178:5: this_Assignment_0= ruleAssignment
{
currentNode=createCompositeNode(grammarAccess.prAbstractToken().ele000ParserRuleCallAssignment(), currentNode);
- pushFollow(FOLLOW_ruleAssignment_in_ruleAbstractToken2505);
+ pushFollow(FOLLOW_ruleAssignment_in_ruleAbstractToken2549);
this_Assignment_0=ruleAssignment();
_fsp--;
@@ -2651,12 +2707,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1170:5: this_Action_1= ruleAction
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1192:5: this_Action_1= ruleAction
{
currentNode=createCompositeNode(grammarAccess.prAbstractToken().ele001ParserRuleCallAction(), currentNode);
- pushFollow(FOLLOW_ruleAction_in_ruleAbstractToken2539);
+ pushFollow(FOLLOW_ruleAction_in_ruleAbstractToken2583);
this_Action_1=ruleAction();
_fsp--;
@@ -2677,12 +2733,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1184:5: this_AbstractTerminal_2= ruleAbstractTerminal
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1206:5: this_AbstractTerminal_2= ruleAbstractTerminal
{
currentNode=createCompositeNode(grammarAccess.prAbstractToken().ele01ParserRuleCallAbstractTerminal(), currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2574);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2618);
this_AbstractTerminal_2=ruleAbstractTerminal();
_fsp--;
@@ -2699,58 +2755,58 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1196:2: (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )?
- int alt26=2;
- int LA26_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1218:2: (lv_cardinality_3= ( ( '?' | '*' ) | '+' ) )?
+ int alt27=2;
+ int LA27_0 = input.LA(1);
- if ( ((LA26_0>=27 && LA26_0<=29)) ) {
- alt26=1;
+ if ( ((LA27_0>=27 && LA27_0<=29)) ) {
+ alt27=1;
}
- switch (alt26) {
+ switch (alt27) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1198:6: lv_cardinality_3= ( ( '?' | '*' ) | '+' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1220:6: lv_cardinality_3= ( ( '?' | '*' ) | '+' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1198:23: ( ( '?' | '*' ) | '+' )
- int alt25=2;
- int LA25_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1220:23: ( ( '?' | '*' ) | '+' )
+ int alt26=2;
+ int LA26_0 = input.LA(1);
- if ( ((LA25_0>=27 && LA25_0<=28)) ) {
- alt25=1;
+ if ( ((LA26_0>=27 && LA26_0<=28)) ) {
+ alt26=1;
}
- else if ( (LA25_0==29) ) {
- alt25=2;
+ else if ( (LA26_0==29) ) {
+ alt26=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1198:23: ( ( '?' | '*' ) | '+' )", 25, 0, input);
+ new NoViableAltException("1220:23: ( ( '?' | '*' ) | '+' )", 26, 0, input);
throw nvae;
}
- switch (alt25) {
+ switch (alt26) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1198:24: ( '?' | '*' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1220:24: ( '?' | '*' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1198:24: ( '?' | '*' )
- int alt24=2;
- int LA24_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1220:24: ( '?' | '*' )
+ int alt25=2;
+ int LA25_0 = input.LA(1);
- if ( (LA24_0==27) ) {
- alt24=1;
+ if ( (LA25_0==27) ) {
+ alt25=1;
}
- else if ( (LA24_0==28) ) {
- alt24=2;
+ else if ( (LA25_0==28) ) {
+ alt25=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1198:24: ( '?' | '*' )", 24, 0, input);
+ new NoViableAltException("1220:24: ( '?' | '*' )", 25, 0, input);
throw nvae;
}
- switch (alt24) {
+ switch (alt25) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1198:25: '?'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1220:25: '?'
{
- match(input,27,FOLLOW_27_in_ruleAbstractToken2604);
+ match(input,27,FOLLOW_27_in_ruleAbstractToken2648);
createLeafNode(grammarAccess.prAbstractToken().ele1000KeywordQuestionMark(), "cardinality");
@@ -2758,9 +2814,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1204:6: '*'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1226:6: '*'
{
- match(input,28,FOLLOW_28_in_ruleAbstractToken2620);
+ match(input,28,FOLLOW_28_in_ruleAbstractToken2664);
createLeafNode(grammarAccess.prAbstractToken().ele1001KeywordAsterisk(), "cardinality");
@@ -2774,9 +2830,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1211:6: '+'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1233:6: '+'
{
- match(input,29,FOLLOW_29_in_ruleAbstractToken2638);
+ match(input,29,FOLLOW_29_in_ruleAbstractToken2682);
createLeafNode(grammarAccess.prAbstractToken().ele101KeywordPlusSign(), "cardinality");
@@ -2827,7 +2883,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTerminalToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1238:1: entryRuleTerminalToken returns [EObject current=null] : iv_ruleTerminalToken= ruleTerminalToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1260:1: entryRuleTerminalToken returns [EObject current=null] : iv_ruleTerminalToken= ruleTerminalToken EOF ;
public final EObject entryRuleTerminalToken() throws RecognitionException {
EObject current = null;
@@ -2835,16 +2891,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1238:55: (iv_ruleTerminalToken= ruleTerminalToken EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1239:2: iv_ruleTerminalToken= ruleTerminalToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1260:55: (iv_ruleTerminalToken= ruleTerminalToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1261:2: iv_ruleTerminalToken= ruleTerminalToken EOF
{
currentNode = createCompositeNode(grammarAccess.prTerminalToken().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2687);
+ pushFollow(FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2731);
iv_ruleTerminalToken=ruleTerminalToken();
_fsp--;
current =iv_ruleTerminalToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalToken2697);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalToken2741);
}
@@ -2862,7 +2918,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTerminalToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1246:1: ruleTerminalToken returns [EObject current=null] : (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1268:1: ruleTerminalToken returns [EObject current=null] : (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? ) ;
public final EObject ruleTerminalToken() throws RecognitionException {
EObject current = null;
@@ -2873,16 +2929,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1251:6: ( (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1252:1: (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1273:6: ( (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1274:1: (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1252:1: (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1253:5: this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1274:1: (this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1275:5: this_TerminalTokenElement_0= ruleTerminalTokenElement (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )?
{
currentNode=createCompositeNode(grammarAccess.prTerminalToken().ele0ParserRuleCallTerminalTokenElement(), currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2744);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2788);
this_TerminalTokenElement_0=ruleTerminalTokenElement();
_fsp--;
@@ -2893,58 +2949,58 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prTerminalToken().ele0ParserRuleCallTerminalTokenElement(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1265:1: (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )?
- int alt29=2;
- int LA29_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1287:1: (lv_cardinality_1= ( ( '?' | '*' ) | '+' ) )?
+ int alt30=2;
+ int LA30_0 = input.LA(1);
- if ( ((LA29_0>=27 && LA29_0<=29)) ) {
- alt29=1;
+ if ( ((LA30_0>=27 && LA30_0<=29)) ) {
+ alt30=1;
}
- switch (alt29) {
+ switch (alt30) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1267:6: lv_cardinality_1= ( ( '?' | '*' ) | '+' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1289:6: lv_cardinality_1= ( ( '?' | '*' ) | '+' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1267:23: ( ( '?' | '*' ) | '+' )
- int alt28=2;
- int LA28_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1289:23: ( ( '?' | '*' ) | '+' )
+ int alt29=2;
+ int LA29_0 = input.LA(1);
- if ( ((LA28_0>=27 && LA28_0<=28)) ) {
- alt28=1;
+ if ( ((LA29_0>=27 && LA29_0<=28)) ) {
+ alt29=1;
}
- else if ( (LA28_0==29) ) {
- alt28=2;
+ else if ( (LA29_0==29) ) {
+ alt29=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1267:23: ( ( '?' | '*' ) | '+' )", 28, 0, input);
+ new NoViableAltException("1289:23: ( ( '?' | '*' ) | '+' )", 29, 0, input);
throw nvae;
}
- switch (alt28) {
+ switch (alt29) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1267:24: ( '?' | '*' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1289:24: ( '?' | '*' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1267:24: ( '?' | '*' )
- int alt27=2;
- int LA27_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1289:24: ( '?' | '*' )
+ int alt28=2;
+ int LA28_0 = input.LA(1);
- if ( (LA27_0==27) ) {
- alt27=1;
+ if ( (LA28_0==27) ) {
+ alt28=1;
}
- else if ( (LA27_0==28) ) {
- alt27=2;
+ else if ( (LA28_0==28) ) {
+ alt28=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1267:24: ( '?' | '*' )", 27, 0, input);
+ new NoViableAltException("1289:24: ( '?' | '*' )", 28, 0, input);
throw nvae;
}
- switch (alt27) {
+ switch (alt28) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1267:25: '?'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1289:25: '?'
{
- match(input,27,FOLLOW_27_in_ruleTerminalToken2773);
+ match(input,27,FOLLOW_27_in_ruleTerminalToken2817);
createLeafNode(grammarAccess.prTerminalToken().ele1000KeywordQuestionMark(), "cardinality");
@@ -2952,9 +3008,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1273:6: '*'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1295:6: '*'
{
- match(input,28,FOLLOW_28_in_ruleTerminalToken2789);
+ match(input,28,FOLLOW_28_in_ruleTerminalToken2833);
createLeafNode(grammarAccess.prTerminalToken().ele1001KeywordAsterisk(), "cardinality");
@@ -2968,9 +3024,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1280:6: '+'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1302:6: '+'
{
- match(input,29,FOLLOW_29_in_ruleTerminalToken2807);
+ match(input,29,FOLLOW_29_in_ruleTerminalToken2851);
createLeafNode(grammarAccess.prTerminalToken().ele101KeywordPlusSign(), "cardinality");
@@ -3021,7 +3077,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAssignment
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1307:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1329:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
public final EObject entryRuleAssignment() throws RecognitionException {
EObject current = null;
@@ -3029,16 +3085,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1307:52: (iv_ruleAssignment= ruleAssignment EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1308:2: iv_ruleAssignment= ruleAssignment EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1329:52: (iv_ruleAssignment= ruleAssignment EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1330:2: iv_ruleAssignment= ruleAssignment EOF
{
currentNode = createCompositeNode(grammarAccess.prAssignment().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2856);
+ pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2900);
iv_ruleAssignment=ruleAssignment();
_fsp--;
current =iv_ruleAssignment;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAssignment2866);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAssignment2910);
}
@@ -3056,7 +3112,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAssignment
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1315:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1337:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) ) ;
public final EObject ruleAssignment() throws RecognitionException {
EObject current = null;
@@ -3068,20 +3124,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1320:6: ( ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:1: ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1342:6: ( ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:1: ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:1: ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:2: ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:1: ( ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:2: ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal_2= ruleAbstractTerminal )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:2: ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:3: (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:2: ( (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:3: (lv_feature_0= RULE_ID ) (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1321:3: (lv_feature_0= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1323:6: lv_feature_0= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:3: (lv_feature_0= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1345:6: lv_feature_0= RULE_ID
{
lv_feature_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment2914);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment2958);
createLeafNode(grammarAccess.prAssignment().ele000TerminalRuleCallID(), "feature");
@@ -3100,50 +3156,50 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1341:2: (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:6: lv_operator_1= ( ( '+=' | '=' ) | '?=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1363:2: (lv_operator_1= ( ( '+=' | '=' ) | '?=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1365:6: lv_operator_1= ( ( '+=' | '=' ) | '?=' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:20: ( ( '+=' | '=' ) | '?=' )
- int alt31=2;
- int LA31_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1365:20: ( ( '+=' | '=' ) | '?=' )
+ int alt32=2;
+ int LA32_0 = input.LA(1);
- if ( ((LA31_0>=30 && LA31_0<=31)) ) {
- alt31=1;
+ if ( ((LA32_0>=30 && LA32_0<=31)) ) {
+ alt32=1;
}
- else if ( (LA31_0==32) ) {
- alt31=2;
+ else if ( (LA32_0==32) ) {
+ alt32=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1343:20: ( ( '+=' | '=' ) | '?=' )", 31, 0, input);
+ new NoViableAltException("1365:20: ( ( '+=' | '=' ) | '?=' )", 32, 0, input);
throw nvae;
}
- switch (alt31) {
+ switch (alt32) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:21: ( '+=' | '=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1365:21: ( '+=' | '=' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:21: ( '+=' | '=' )
- int alt30=2;
- int LA30_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1365:21: ( '+=' | '=' )
+ int alt31=2;
+ int LA31_0 = input.LA(1);
- if ( (LA30_0==30) ) {
- alt30=1;
+ if ( (LA31_0==30) ) {
+ alt31=1;
}
- else if ( (LA30_0==31) ) {
- alt30=2;
+ else if ( (LA31_0==31) ) {
+ alt31=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1343:21: ( '+=' | '=' )", 30, 0, input);
+ new NoViableAltException("1365:21: ( '+=' | '=' )", 31, 0, input);
throw nvae;
}
- switch (alt30) {
+ switch (alt31) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1343:22: '+='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1365:22: '+='
{
- match(input,30,FOLLOW_30_in_ruleAssignment2945);
+ match(input,30,FOLLOW_30_in_ruleAssignment2989);
createLeafNode(grammarAccess.prAssignment().ele01000KeywordPlusSignEqualsSign(), "operator");
@@ -3151,9 +3207,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1349:6: '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1371:6: '='
{
- match(input,31,FOLLOW_31_in_ruleAssignment2961);
+ match(input,31,FOLLOW_31_in_ruleAssignment3005);
createLeafNode(grammarAccess.prAssignment().ele01001KeywordEqualsSign(), "operator");
@@ -3167,9 +3223,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1356:6: '?='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1378:6: '?='
{
- match(input,32,FOLLOW_32_in_ruleAssignment2979);
+ match(input,32,FOLLOW_32_in_ruleAssignment3023);
createLeafNode(grammarAccess.prAssignment().ele0101KeywordQuestionMarkEqualsSign(), "operator");
@@ -3197,13 +3253,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1376:3: (lv_terminal_2= ruleAbstractTerminal )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1379:6: lv_terminal_2= ruleAbstractTerminal
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1398:3: (lv_terminal_2= ruleAbstractTerminal )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1401:6: lv_terminal_2= ruleAbstractTerminal
{
currentNode=createCompositeNode(grammarAccess.prAssignment().ele10ParserRuleCallAbstractTerminal(), currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAssignment3029);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAssignment3073);
lv_terminal_2=ruleAbstractTerminal();
_fsp--;
@@ -3246,7 +3302,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAction
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1404:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1426:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ;
public final EObject entryRuleAction() throws RecognitionException {
EObject current = null;
@@ -3254,16 +3310,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1404:48: (iv_ruleAction= ruleAction EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1405:2: iv_ruleAction= ruleAction EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1426:48: (iv_ruleAction= ruleAction EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1427:2: iv_ruleAction= ruleAction EOF
{
currentNode = createCompositeNode(grammarAccess.prAction().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAction_in_entryRuleAction3066);
+ pushFollow(FOLLOW_ruleAction_in_entryRuleAction3110);
iv_ruleAction=ruleAction();
_fsp--;
current =iv_ruleAction;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAction3076);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAction3120);
}
@@ -3281,7 +3337,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAction
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1412:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1434:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' ) ;
public final EObject ruleAction() throws RecognitionException {
EObject current = null;
@@ -3293,50 +3349,50 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1417:6: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1439:6: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' ) '}'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) ) 'current'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) ) (lv_operator_6= ( '=' | '+=' ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' ) (lv_feature_5= RULE_ID )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) ) '.'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:7: ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:7: ( '{' ( 'current' '=' )? ) (lv_typeName_3= ruleTypeRef )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:7: ( '{' ( 'current' '=' )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1418:8: '{' ( 'current' '=' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:7: ( '{' ( 'current' '=' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1440:8: '{' ( 'current' '=' )?
{
- match(input,33,FOLLOW_33_in_ruleAction3116);
+ match(input,33,FOLLOW_33_in_ruleAction3160);
createLeafNode(grammarAccess.prAction().ele0000000KeywordLeftCurlyBracket(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1422:1: ( 'current' '=' )?
- int alt32=2;
- int LA32_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1444:1: ( 'current' '=' )?
+ int alt33=2;
+ int LA33_0 = input.LA(1);
- if ( (LA32_0==34) ) {
- alt32=1;
+ if ( (LA33_0==34) ) {
+ alt33=1;
}
- switch (alt32) {
+ switch (alt33) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1422:2: 'current' '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1444:2: 'current' '='
{
- match(input,34,FOLLOW_34_in_ruleAction3126);
+ match(input,34,FOLLOW_34_in_ruleAction3170);
createLeafNode(grammarAccess.prAction().ele00000010KeywordCurrent(), null);
- match(input,31,FOLLOW_31_in_ruleAction3135);
+ match(input,31,FOLLOW_31_in_ruleAction3179);
createLeafNode(grammarAccess.prAction().ele00000011KeywordEqualsSign(), null);
@@ -3349,13 +3405,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1430:4: (lv_typeName_3= ruleTypeRef )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1433:6: lv_typeName_3= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1452:4: (lv_typeName_3= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1455:6: lv_typeName_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prAction().ele0000010ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleAction3172);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleAction3216);
lv_typeName_3=ruleTypeRef();
_fsp--;
@@ -3378,18 +3434,18 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,17,FOLLOW_17_in_ruleAction3186);
+ match(input,17,FOLLOW_17_in_ruleAction3230);
createLeafNode(grammarAccess.prAction().ele00001KeywordFullStop(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1455:2: (lv_feature_5= RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1457:6: lv_feature_5= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1477:2: (lv_feature_5= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1479:6: lv_feature_5= RULE_ID
{
lv_feature_5=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction3209);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction3253);
createLeafNode(grammarAccess.prAction().ele00010TerminalRuleCallID(), "feature");
@@ -3411,30 +3467,30 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1475:3: (lv_operator_6= ( '=' | '+=' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1477:6: lv_operator_6= ( '=' | '+=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1497:3: (lv_operator_6= ( '=' | '+=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1499:6: lv_operator_6= ( '=' | '+=' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1477:20: ( '=' | '+=' )
- int alt33=2;
- int LA33_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1499:20: ( '=' | '+=' )
+ int alt34=2;
+ int LA34_0 = input.LA(1);
- if ( (LA33_0==31) ) {
- alt33=1;
+ if ( (LA34_0==31) ) {
+ alt34=1;
}
- else if ( (LA33_0==30) ) {
- alt33=2;
+ else if ( (LA34_0==30) ) {
+ alt34=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1477:20: ( '=' | '+=' )", 33, 0, input);
+ new NoViableAltException("1499:20: ( '=' | '+=' )", 34, 0, input);
throw nvae;
}
- switch (alt33) {
+ switch (alt34) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1477:21: '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1499:21: '='
{
- match(input,31,FOLLOW_31_in_ruleAction3240);
+ match(input,31,FOLLOW_31_in_ruleAction3284);
createLeafNode(grammarAccess.prAction().ele00100KeywordEqualsSign(), "operator");
@@ -3442,9 +3498,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1483:6: '+='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1505:6: '+='
{
- match(input,30,FOLLOW_30_in_ruleAction3256);
+ match(input,30,FOLLOW_30_in_ruleAction3300);
createLeafNode(grammarAccess.prAction().ele00101KeywordPlusSignEqualsSign(), "operator");
@@ -3472,14 +3528,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,34,FOLLOW_34_in_ruleAction3281);
+ match(input,34,FOLLOW_34_in_ruleAction3325);
createLeafNode(grammarAccess.prAction().ele01KeywordCurrent(), null);
}
- match(input,35,FOLLOW_35_in_ruleAction3291);
+ match(input,35,FOLLOW_35_in_ruleAction3335);
createLeafNode(grammarAccess.prAction().ele1KeywordRightCurlyBracket(), null);
@@ -3506,7 +3562,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAbstractTerminal
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1518:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1540:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ;
public final EObject entryRuleAbstractTerminal() throws RecognitionException {
EObject current = null;
@@ -3514,16 +3570,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1518:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1519:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1540:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1541:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF
{
currentNode = createCompositeNode(grammarAccess.prAbstractTerminal().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3324);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3368);
iv_ruleAbstractTerminal=ruleAbstractTerminal();
_fsp--;
current =iv_ruleAbstractTerminal;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractTerminal3334);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractTerminal3378);
}
@@ -3541,7 +3597,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAbstractTerminal
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1526:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1548:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference ) ;
public final EObject ruleAbstractTerminal() throws RecognitionException {
EObject current = null;
@@ -3557,73 +3613,73 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1531:6: ( ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1553:6: ( ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )
- int alt36=2;
- int LA36_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )
+ int alt37=2;
+ int LA37_0 = input.LA(1);
- if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)||LA36_0==14) ) {
- alt36=1;
+ if ( ((LA37_0>=RULE_ID && LA37_0<=RULE_STRING)||LA37_0==15) ) {
+ alt37=1;
}
- else if ( (LA36_0==39) ) {
- alt36=2;
+ else if ( (LA37_0==39) ) {
+ alt37=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1532:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )", 36, 0, input);
+ new NoViableAltException("1554:1: ( ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement ) | this_CrossReference_3= ruleCrossReference )", 37, 0, input);
throw nvae;
}
- switch (alt36) {
+ switch (alt37) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )
- int alt35=2;
- int LA35_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )
+ int alt36=2;
+ int LA36_0 = input.LA(1);
- if ( ((LA35_0>=RULE_ID && LA35_0<=RULE_STRING)) ) {
- alt35=1;
+ if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)) ) {
+ alt36=1;
}
- else if ( (LA35_0==14) ) {
- alt35=2;
+ else if ( (LA36_0==15) ) {
+ alt36=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1532:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )", 35, 0, input);
+ new NoViableAltException("1554:2: ( (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedElement_2= ruleParenthesizedElement )", 36, 0, input);
throw nvae;
}
- switch (alt35) {
+ switch (alt36) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1532:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )
- int alt34=2;
- int LA34_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1554:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )
+ int alt35=2;
+ int LA35_0 = input.LA(1);
- if ( (LA34_0==RULE_STRING) ) {
- alt34=1;
+ if ( (LA35_0==RULE_STRING) ) {
+ alt35=1;
}
- else if ( (LA34_0==RULE_ID) ) {
- alt34=2;
+ else if ( (LA35_0==RULE_ID) ) {
+ alt35=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1532:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )", 34, 0, input);
+ new NoViableAltException("1554:3: (this_Keyword_0= ruleKeyword | this_RuleCall_1= ruleRuleCall )", 35, 0, input);
throw nvae;
}
- switch (alt34) {
+ switch (alt35) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1533:5: this_Keyword_0= ruleKeyword
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1555:5: this_Keyword_0= ruleKeyword
{
currentNode=createCompositeNode(grammarAccess.prAbstractTerminal().ele000ParserRuleCallKeyword(), currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleAbstractTerminal3383);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleAbstractTerminal3427);
this_Keyword_0=ruleKeyword();
_fsp--;
@@ -3638,12 +3694,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1547:5: this_RuleCall_1= ruleRuleCall
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1569:5: this_RuleCall_1= ruleRuleCall
{
currentNode=createCompositeNode(grammarAccess.prAbstractTerminal().ele001ParserRuleCallRuleCall(), currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3417);
+ pushFollow(FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3461);
this_RuleCall_1=ruleRuleCall();
_fsp--;
@@ -3664,12 +3720,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1561:5: this_ParenthesizedElement_2= ruleParenthesizedElement
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1583:5: this_ParenthesizedElement_2= ruleParenthesizedElement
{
currentNode=createCompositeNode(grammarAccess.prAbstractTerminal().ele01ParserRuleCallParenthesizedElement(), currentNode);
- pushFollow(FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3452);
+ pushFollow(FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3496);
this_ParenthesizedElement_2=ruleParenthesizedElement();
_fsp--;
@@ -3690,12 +3746,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1575:5: this_CrossReference_3= ruleCrossReference
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1597:5: this_CrossReference_3= ruleCrossReference
{
currentNode=createCompositeNode(grammarAccess.prAbstractTerminal().ele1ParserRuleCallCrossReference(), currentNode);
- pushFollow(FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3487);
+ pushFollow(FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3531);
this_CrossReference_3=ruleCrossReference();
_fsp--;
@@ -3732,7 +3788,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleTerminalTokenElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1594:1: entryRuleTerminalTokenElement returns [EObject current=null] : iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1616:1: entryRuleTerminalTokenElement returns [EObject current=null] : iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF ;
public final EObject entryRuleTerminalTokenElement() throws RecognitionException {
EObject current = null;
@@ -3740,16 +3796,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1594:62: (iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1595:2: iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1616:62: (iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1617:2: iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF
{
currentNode = createCompositeNode(grammarAccess.prTerminalTokenElement().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3526);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3570);
iv_ruleTerminalTokenElement=ruleTerminalTokenElement();
_fsp--;
current =iv_ruleTerminalTokenElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalTokenElement3536);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalTokenElement3580);
}
@@ -3767,7 +3823,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleTerminalTokenElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1602:1: ruleTerminalTokenElement returns [EObject current=null] : ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1624:1: ruleTerminalTokenElement returns [EObject current=null] : ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard ) ;
public final EObject ruleTerminalTokenElement() throws RecognitionException {
EObject current = null;
@@ -3785,93 +3841,93 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1607:6: ( ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1629:6: ( ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )
- int alt40=2;
- int LA40_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )
+ int alt41=2;
+ int LA41_0 = input.LA(1);
- if ( ((LA40_0>=RULE_ID && LA40_0<=RULE_STRING)||LA40_0==14||(LA40_0>=36 && LA40_0<=37)) ) {
- alt40=1;
+ if ( ((LA41_0>=RULE_ID && LA41_0<=RULE_STRING)||LA41_0==15||(LA41_0>=36 && LA41_0<=37)) ) {
+ alt41=1;
}
- else if ( (LA40_0==17) ) {
- alt40=2;
+ else if ( (LA41_0==17) ) {
+ alt41=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1608:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )", 40, 0, input);
+ new NoViableAltException("1630:1: ( ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken ) | this_Wildcard_4= ruleWildcard )", 41, 0, input);
throw nvae;
}
- switch (alt40) {
+ switch (alt41) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )
- int alt39=2;
- int LA39_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )
+ int alt40=2;
+ int LA40_0 = input.LA(1);
- if ( ((LA39_0>=RULE_ID && LA39_0<=RULE_STRING)||LA39_0==14) ) {
- alt39=1;
+ if ( ((LA40_0>=RULE_ID && LA40_0<=RULE_STRING)||LA40_0==15) ) {
+ alt40=1;
}
- else if ( ((LA39_0>=36 && LA39_0<=37)) ) {
- alt39=2;
+ else if ( ((LA40_0>=36 && LA40_0<=37)) ) {
+ alt40=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1608:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )", 39, 0, input);
+ new NoViableAltException("1630:2: ( ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken_3= ruleAbstractNegatedToken )", 40, 0, input);
throw nvae;
}
- switch (alt39) {
+ switch (alt40) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )
- int alt38=2;
- int LA38_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )
+ int alt39=2;
+ int LA39_0 = input.LA(1);
- if ( ((LA38_0>=RULE_ID && LA38_0<=RULE_STRING)) ) {
- alt38=1;
+ if ( ((LA39_0>=RULE_ID && LA39_0<=RULE_STRING)) ) {
+ alt39=1;
}
- else if ( (LA38_0==14) ) {
- alt38=2;
+ else if ( (LA39_0==15) ) {
+ alt39=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1608:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )", 38, 0, input);
+ new NoViableAltException("1630:3: ( (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall ) | this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement )", 39, 0, input);
throw nvae;
}
- switch (alt38) {
+ switch (alt39) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1608:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )
- int alt37=2;
- int LA37_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1630:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )
+ int alt38=2;
+ int LA38_0 = input.LA(1);
- if ( (LA37_0==RULE_STRING) ) {
- alt37=1;
+ if ( (LA38_0==RULE_STRING) ) {
+ alt38=1;
}
- else if ( (LA37_0==RULE_ID) ) {
- alt37=2;
+ else if ( (LA38_0==RULE_ID) ) {
+ alt38=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1608:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )", 37, 0, input);
+ new NoViableAltException("1630:4: (this_CharacterRange_0= ruleCharacterRange | this_RuleCall_1= ruleRuleCall )", 38, 0, input);
throw nvae;
}
- switch (alt37) {
+ switch (alt38) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1609:5: this_CharacterRange_0= ruleCharacterRange
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1631:5: this_CharacterRange_0= ruleCharacterRange
{
currentNode=createCompositeNode(grammarAccess.prTerminalTokenElement().ele0000ParserRuleCallCharacterRange(), currentNode);
- pushFollow(FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3586);
+ pushFollow(FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3630);
this_CharacterRange_0=ruleCharacterRange();
_fsp--;
@@ -3886,12 +3942,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1623:5: this_RuleCall_1= ruleRuleCall
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1645:5: this_RuleCall_1= ruleRuleCall
{
currentNode=createCompositeNode(grammarAccess.prTerminalTokenElement().ele0001ParserRuleCallRuleCall(), currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3620);
+ pushFollow(FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3664);
this_RuleCall_1=ruleRuleCall();
_fsp--;
@@ -3912,12 +3968,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1637:5: this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1659:5: this_ParenthesizedTerminalElement_2= ruleParenthesizedTerminalElement
{
currentNode=createCompositeNode(grammarAccess.prTerminalTokenElement().ele001ParserRuleCallParenthesizedTerminalElement(), currentNode);
- pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3655);
+ pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3699);
this_ParenthesizedTerminalElement_2=ruleParenthesizedTerminalElement();
_fsp--;
@@ -3938,12 +3994,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1651:5: this_AbstractNegatedToken_3= ruleAbstractNegatedToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1673:5: this_AbstractNegatedToken_3= ruleAbstractNegatedToken
{
currentNode=createCompositeNode(grammarAccess.prTerminalTokenElement().ele01ParserRuleCallAbstractNegatedToken(), currentNode);
- pushFollow(FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3690);
+ pushFollow(FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3734);
this_AbstractNegatedToken_3=ruleAbstractNegatedToken();
_fsp--;
@@ -3964,12 +4020,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1665:5: this_Wildcard_4= ruleWildcard
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1687:5: this_Wildcard_4= ruleWildcard
{
currentNode=createCompositeNode(grammarAccess.prTerminalTokenElement().ele1ParserRuleCallWildcard(), currentNode);
- pushFollow(FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3725);
+ pushFollow(FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3769);
this_Wildcard_4=ruleWildcard();
_fsp--;
@@ -4006,7 +4062,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleAbstractNegatedToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1684:1: entryRuleAbstractNegatedToken returns [EObject current=null] : iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1706:1: entryRuleAbstractNegatedToken returns [EObject current=null] : iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF ;
public final EObject entryRuleAbstractNegatedToken() throws RecognitionException {
EObject current = null;
@@ -4014,16 +4070,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1684:62: (iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1685:2: iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1706:62: (iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1707:2: iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF
{
currentNode = createCompositeNode(grammarAccess.prAbstractNegatedToken().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3764);
+ pushFollow(FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808);
iv_ruleAbstractNegatedToken=ruleAbstractNegatedToken();
_fsp--;
current =iv_ruleAbstractNegatedToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractNegatedToken3774);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818);
}
@@ -4041,7 +4097,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleAbstractNegatedToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1692:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1714:1: ruleAbstractNegatedToken returns [EObject current=null] : (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) ;
public final EObject ruleAbstractNegatedToken() throws RecognitionException {
EObject current = null;
@@ -4053,33 +4109,33 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1697:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1698:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1719:6: ( (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1698:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )
- int alt41=2;
- int LA41_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )
+ int alt42=2;
+ int LA42_0 = input.LA(1);
- if ( (LA41_0==36) ) {
- alt41=1;
+ if ( (LA42_0==36) ) {
+ alt42=1;
}
- else if ( (LA41_0==37) ) {
- alt41=2;
+ else if ( (LA42_0==37) ) {
+ alt42=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1698:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 41, 0, input);
+ new NoViableAltException("1720:1: (this_NegatedToken_0= ruleNegatedToken | this_UpToToken_1= ruleUpToToken )", 42, 0, input);
throw nvae;
}
- switch (alt41) {
+ switch (alt42) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1699:5: this_NegatedToken_0= ruleNegatedToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1721:5: this_NegatedToken_0= ruleNegatedToken
{
currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele0ParserRuleCallNegatedToken(), currentNode);
- pushFollow(FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3821);
+ pushFollow(FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865);
this_NegatedToken_0=ruleNegatedToken();
_fsp--;
@@ -4094,12 +4150,12 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1713:5: this_UpToToken_1= ruleUpToToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1735:5: this_UpToToken_1= ruleUpToToken
{
currentNode=createCompositeNode(grammarAccess.prAbstractNegatedToken().ele1ParserRuleCallUpToToken(), currentNode);
- pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3855);
+ pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899);
this_UpToToken_1=ruleUpToToken();
_fsp--;
@@ -4136,7 +4192,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleNegatedToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1732:1: entryRuleNegatedToken returns [EObject current=null] : iv_ruleNegatedToken= ruleNegatedToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1754:1: entryRuleNegatedToken returns [EObject current=null] : iv_ruleNegatedToken= ruleNegatedToken EOF ;
public final EObject entryRuleNegatedToken() throws RecognitionException {
EObject current = null;
@@ -4144,16 +4200,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1732:54: (iv_ruleNegatedToken= ruleNegatedToken EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1733:2: iv_ruleNegatedToken= ruleNegatedToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1754:54: (iv_ruleNegatedToken= ruleNegatedToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1755:2: iv_ruleNegatedToken= ruleNegatedToken EOF
{
currentNode = createCompositeNode(grammarAccess.prNegatedToken().getRule(), currentNode);
- pushFollow(FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3894);
+ pushFollow(FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938);
iv_ruleNegatedToken=ruleNegatedToken();
_fsp--;
current =iv_ruleNegatedToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleNegatedToken3904);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleNegatedToken3948);
}
@@ -4171,7 +4227,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleNegatedToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1740:1: ruleNegatedToken returns [EObject current=null] : ( '!' (lv_terminal_1= ruleTerminalTokenElement ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1762:1: ruleNegatedToken returns [EObject current=null] : ( '!' (lv_terminal_1= ruleTerminalTokenElement ) ) ;
public final EObject ruleNegatedToken() throws RecognitionException {
EObject current = null;
@@ -4181,23 +4237,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1745:6: ( ( '!' (lv_terminal_1= ruleTerminalTokenElement ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1746:1: ( '!' (lv_terminal_1= ruleTerminalTokenElement ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1767:6: ( ( '!' (lv_terminal_1= ruleTerminalTokenElement ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1768:1: ( '!' (lv_terminal_1= ruleTerminalTokenElement ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1746:1: ( '!' (lv_terminal_1= ruleTerminalTokenElement ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1746:2: '!' (lv_terminal_1= ruleTerminalTokenElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1768:1: ( '!' (lv_terminal_1= ruleTerminalTokenElement ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1768:2: '!' (lv_terminal_1= ruleTerminalTokenElement )
{
- match(input,36,FOLLOW_36_in_ruleNegatedToken3938);
+ match(input,36,FOLLOW_36_in_ruleNegatedToken3982);
createLeafNode(grammarAccess.prNegatedToken().ele0KeywordExclamationMark(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1750:1: (lv_terminal_1= ruleTerminalTokenElement )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1753:6: lv_terminal_1= ruleTerminalTokenElement
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1772:1: (lv_terminal_1= ruleTerminalTokenElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1775:6: lv_terminal_1= ruleTerminalTokenElement
{
currentNode=createCompositeNode(grammarAccess.prNegatedToken().ele10ParserRuleCallTerminalTokenElement(), currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken3972);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016);
lv_terminal_1=ruleTerminalTokenElement();
_fsp--;
@@ -4240,7 +4296,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleUpToToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1778:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:1: entryRuleUpToToken returns [EObject current=null] : iv_ruleUpToToken= ruleUpToToken EOF ;
public final EObject entryRuleUpToToken() throws RecognitionException {
EObject current = null;
@@ -4248,16 +4304,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1778:51: (iv_ruleUpToToken= ruleUpToToken EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1779:2: iv_ruleUpToToken= ruleUpToToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1800:51: (iv_ruleUpToToken= ruleUpToToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1801:2: iv_ruleUpToToken= ruleUpToToken EOF
{
currentNode = createCompositeNode(grammarAccess.prUpToToken().getRule(), currentNode);
- pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4009);
+ pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053);
iv_ruleUpToToken=ruleUpToToken();
_fsp--;
current =iv_ruleUpToToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4019);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4063);
}
@@ -4275,7 +4331,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleUpToToken
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1786:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1808:1: ruleUpToToken returns [EObject current=null] : ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) ;
public final EObject ruleUpToToken() throws RecognitionException {
EObject current = null;
@@ -4285,23 +4341,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1791:6: ( ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1792:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1813:6: ( ( '->' (lv_terminal_1= ruleTerminalTokenElement ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1792:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1792:2: '->' (lv_terminal_1= ruleTerminalTokenElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:1: ( '->' (lv_terminal_1= ruleTerminalTokenElement ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1814:2: '->' (lv_terminal_1= ruleTerminalTokenElement )
{
- match(input,37,FOLLOW_37_in_ruleUpToToken4053);
+ match(input,37,FOLLOW_37_in_ruleUpToToken4097);
createLeafNode(grammarAccess.prUpToToken().ele0KeywordHyphenMinusGreaterThanSign(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1796:1: (lv_terminal_1= ruleTerminalTokenElement )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1799:6: lv_terminal_1= ruleTerminalTokenElement
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1818:1: (lv_terminal_1= ruleTerminalTokenElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1821:6: lv_terminal_1= ruleTerminalTokenElement
{
currentNode=createCompositeNode(grammarAccess.prUpToToken().ele10ParserRuleCallTerminalTokenElement(), currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4087);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131);
lv_terminal_1=ruleTerminalTokenElement();
_fsp--;
@@ -4344,7 +4400,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleWildcard
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1824:1: entryRuleWildcard returns [EObject current=null] : iv_ruleWildcard= ruleWildcard EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1846:1: entryRuleWildcard returns [EObject current=null] : iv_ruleWildcard= ruleWildcard EOF ;
public final EObject entryRuleWildcard() throws RecognitionException {
EObject current = null;
@@ -4352,16 +4408,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1824:50: (iv_ruleWildcard= ruleWildcard EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1825:2: iv_ruleWildcard= ruleWildcard EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1846:50: (iv_ruleWildcard= ruleWildcard EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1847:2: iv_ruleWildcard= ruleWildcard EOF
{
currentNode = createCompositeNode(grammarAccess.prWildcard().getRule(), currentNode);
- pushFollow(FOLLOW_ruleWildcard_in_entryRuleWildcard4124);
+ pushFollow(FOLLOW_ruleWildcard_in_entryRuleWildcard4168);
iv_ruleWildcard=ruleWildcard();
_fsp--;
current =iv_ruleWildcard;
- match(input,EOF,FOLLOW_EOF_in_entryRuleWildcard4134);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleWildcard4178);
}
@@ -4379,7 +4435,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleWildcard
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1832:1: ruleWildcard returns [EObject current=null] : (lv_isWildcard_0= '.' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1854:1: ruleWildcard returns [EObject current=null] : (lv_isWildcard_0= '.' ) ;
public final EObject ruleWildcard() throws RecognitionException {
EObject current = null;
@@ -4388,14 +4444,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1837:6: ( (lv_isWildcard_0= '.' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1838:1: (lv_isWildcard_0= '.' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1859:6: ( (lv_isWildcard_0= '.' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1860:1: (lv_isWildcard_0= '.' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1838:1: (lv_isWildcard_0= '.' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1840:6: lv_isWildcard_0= '.'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1860:1: (lv_isWildcard_0= '.' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1862:6: lv_isWildcard_0= '.'
{
lv_isWildcard_0=(Token)input.LT(1);
- match(input,17,FOLLOW_17_in_ruleWildcard4179);
+ match(input,17,FOLLOW_17_in_ruleWildcard4223);
createLeafNode(grammarAccess.prWildcard().ele0KeywordFullStop(), "isWildcard");
@@ -4434,7 +4490,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleCharacterRange
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1866:1: entryRuleCharacterRange returns [EObject current=null] : iv_ruleCharacterRange= ruleCharacterRange EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1888:1: entryRuleCharacterRange returns [EObject current=null] : iv_ruleCharacterRange= ruleCharacterRange EOF ;
public final EObject entryRuleCharacterRange() throws RecognitionException {
EObject current = null;
@@ -4442,16 +4498,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1866:56: (iv_ruleCharacterRange= ruleCharacterRange EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1867:2: iv_ruleCharacterRange= ruleCharacterRange EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1888:56: (iv_ruleCharacterRange= ruleCharacterRange EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1889:2: iv_ruleCharacterRange= ruleCharacterRange EOF
{
currentNode = createCompositeNode(grammarAccess.prCharacterRange().getRule(), currentNode);
- pushFollow(FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4224);
+ pushFollow(FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4268);
iv_ruleCharacterRange=ruleCharacterRange();
_fsp--;
current =iv_ruleCharacterRange;
- match(input,EOF,FOLLOW_EOF_in_entryRuleCharacterRange4234);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleCharacterRange4278);
}
@@ -4469,7 +4525,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleCharacterRange
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1874:1: ruleCharacterRange returns [EObject current=null] : (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1896:1: ruleCharacterRange returns [EObject current=null] : (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? ) ;
public final EObject ruleCharacterRange() throws RecognitionException {
EObject current = null;
@@ -4481,16 +4537,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1879:6: ( (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1880:1: (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1901:6: ( (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1902:1: (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1880:1: (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1881:5: this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1902:1: (this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1903:5: this_Keyword_0= ruleKeyword ( ( () '..' ) (lv_right_3= ruleKeyword ) )?
{
currentNode=createCompositeNode(grammarAccess.prCharacterRange().ele0ParserRuleCallKeyword(), currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4281);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4325);
this_Keyword_0=ruleKeyword();
_fsp--;
@@ -4501,22 +4557,22 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
createLeafNode(grammarAccess.prCharacterRange().ele0ParserRuleCallKeyword(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1893:1: ( ( () '..' ) (lv_right_3= ruleKeyword ) )?
- int alt42=2;
- int LA42_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1915:1: ( ( () '..' ) (lv_right_3= ruleKeyword ) )?
+ int alt43=2;
+ int LA43_0 = input.LA(1);
- if ( (LA42_0==38) ) {
- alt42=1;
+ if ( (LA43_0==38) ) {
+ alt43=1;
}
- switch (alt42) {
+ switch (alt43) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1893:2: ( () '..' ) (lv_right_3= ruleKeyword )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1915:2: ( () '..' ) (lv_right_3= ruleKeyword )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1893:2: ( () '..' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1893:3: () '..'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1915:2: ( () '..' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1915:3: () '..'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1893:3: ()
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1894:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1915:3: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1916:5:
{
temp=factory.create(grammarAccess.prCharacterRange().ele100ActionCharacterRangeleft().getTypeName().getType());
@@ -4536,20 +4592,20 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,38,FOLLOW_38_in_ruleCharacterRange4307);
+ match(input,38,FOLLOW_38_in_ruleCharacterRange4351);
createLeafNode(grammarAccess.prCharacterRange().ele101KeywordFullStopFullStop(), null);
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1913:2: (lv_right_3= ruleKeyword )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1916:6: lv_right_3= ruleKeyword
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1935:2: (lv_right_3= ruleKeyword )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1938:6: lv_right_3= ruleKeyword
{
currentNode=createCompositeNode(grammarAccess.prCharacterRange().ele110ParserRuleCallKeyword(), currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4342);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4386);
lv_right_3=ruleKeyword();
_fsp--;
@@ -4598,7 +4654,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleCrossReference
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1941:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1963:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ;
public final EObject entryRuleCrossReference() throws RecognitionException {
EObject current = null;
@@ -4606,16 +4662,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1941:56: (iv_ruleCrossReference= ruleCrossReference EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1942:2: iv_ruleCrossReference= ruleCrossReference EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1963:56: (iv_ruleCrossReference= ruleCrossReference EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1964:2: iv_ruleCrossReference= ruleCrossReference EOF
{
currentNode = createCompositeNode(grammarAccess.prCrossReference().getRule(), currentNode);
- pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference4381);
+ pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference4425);
iv_ruleCrossReference=ruleCrossReference();
_fsp--;
current =iv_ruleCrossReference;
- match(input,EOF,FOLLOW_EOF_in_entryRuleCrossReference4391);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleCrossReference4435);
}
@@ -4633,7 +4689,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleCrossReference
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1949:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1971:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' ) ;
public final EObject ruleCrossReference() throws RecognitionException {
EObject current = null;
@@ -4643,29 +4699,29 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1954:6: ( ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:1: ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1976:6: ( ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:1: ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:1: ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:2: ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:1: ( ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:2: ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? ) ']'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:2: ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:3: ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:2: ( ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:3: ( '[' (lv_type_1= ruleTypeRef ) ) ( '|' ( RULE_ID ) )?
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:3: ( '[' (lv_type_1= ruleTypeRef ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1955:4: '[' (lv_type_1= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:3: ( '[' (lv_type_1= ruleTypeRef ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1977:4: '[' (lv_type_1= ruleTypeRef )
{
- match(input,39,FOLLOW_39_in_ruleCrossReference4427);
+ match(input,39,FOLLOW_39_in_ruleCrossReference4471);
createLeafNode(grammarAccess.prCrossReference().ele000KeywordLeftSquareBracket(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1959:1: (lv_type_1= ruleTypeRef )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1962:6: lv_type_1= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1981:1: (lv_type_1= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1984:6: lv_type_1= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prCrossReference().ele0010ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleCrossReference4461);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleCrossReference4505);
lv_type_1=ruleTypeRef();
_fsp--;
@@ -4688,23 +4744,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1980:3: ( '|' ( RULE_ID ) )?
- int alt43=2;
- int LA43_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2002:3: ( '|' ( RULE_ID ) )?
+ int alt44=2;
+ int LA44_0 = input.LA(1);
- if ( (LA43_0==26) ) {
- alt43=1;
+ if ( (LA44_0==26) ) {
+ alt44=1;
}
- switch (alt43) {
+ switch (alt44) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1980:4: '|' ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2002:4: '|' ( RULE_ID )
{
- match(input,26,FOLLOW_26_in_ruleCrossReference4476);
+ match(input,26,FOLLOW_26_in_ruleCrossReference4520);
createLeafNode(grammarAccess.prCrossReference().ele010KeywordVerticalLine(), null);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1984:1: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:1987:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2006:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2009:3: RULE_ID
{
if (current==null) {
@@ -4712,7 +4768,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference4498);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference4542);
createLeafNode(grammarAccess.prCrossReference().ele0110CrossReferenceEStringAbstractRule(), "rule");
@@ -4728,7 +4784,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,40,FOLLOW_40_in_ruleCrossReference4513);
+ match(input,40,FOLLOW_40_in_ruleCrossReference4557);
createLeafNode(grammarAccess.prCrossReference().ele1KeywordRightSquareBracket(), null);
@@ -4755,7 +4811,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleParenthesizedElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2011:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2033:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
public final EObject entryRuleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -4763,16 +4819,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2011:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2012:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2033:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2034:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
{
currentNode = createCompositeNode(grammarAccess.prParenthesizedElement().getRule(), currentNode);
- pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4546);
+ pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4590);
iv_ruleParenthesizedElement=ruleParenthesizedElement();
_fsp--;
current =iv_ruleParenthesizedElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement4556);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement4600);
}
@@ -4790,7 +4846,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleParenthesizedElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2019:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2041:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' ) ;
public final EObject ruleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -4800,23 +4856,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2024:6: ( ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2025:1: ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2046:6: ( ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2047:1: ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2025:1: ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2025:2: ( '(' this_Alternatives_1= ruleAlternatives ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2047:1: ( ( '(' this_Alternatives_1= ruleAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2047:2: ( '(' this_Alternatives_1= ruleAlternatives ) ')'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2025:2: ( '(' this_Alternatives_1= ruleAlternatives )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2025:3: '(' this_Alternatives_1= ruleAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2047:2: ( '(' this_Alternatives_1= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2047:3: '(' this_Alternatives_1= ruleAlternatives
{
- match(input,14,FOLLOW_14_in_ruleParenthesizedElement4591);
+ match(input,15,FOLLOW_15_in_ruleParenthesizedElement4635);
createLeafNode(grammarAccess.prParenthesizedElement().ele00KeywordLeftParenthesis(), null);
currentNode=createCompositeNode(grammarAccess.prParenthesizedElement().ele01ParserRuleCallAlternatives(), currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4613);
+ pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4657);
this_Alternatives_1=ruleAlternatives();
_fsp--;
@@ -4830,7 +4886,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,16,FOLLOW_16_in_ruleParenthesizedElement4629);
+ match(input,16,FOLLOW_16_in_ruleParenthesizedElement4673);
createLeafNode(grammarAccess.prParenthesizedElement().ele1KeywordRightParenthesis(), null);
@@ -4857,7 +4913,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleParenthesizedTerminalElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2053:1: entryRuleParenthesizedTerminalElement returns [EObject current=null] : iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2075:1: entryRuleParenthesizedTerminalElement returns [EObject current=null] : iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF ;
public final EObject entryRuleParenthesizedTerminalElement() throws RecognitionException {
EObject current = null;
@@ -4865,16 +4921,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2053:70: (iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2054:2: iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2075:70: (iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2076:2: iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF
{
currentNode = createCompositeNode(grammarAccess.prParenthesizedTerminalElement().getRule(), currentNode);
- pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4662);
+ pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4706);
iv_ruleParenthesizedTerminalElement=ruleParenthesizedTerminalElement();
_fsp--;
current =iv_ruleParenthesizedTerminalElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4672);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4716);
}
@@ -4892,7 +4948,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleParenthesizedTerminalElement
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2061:1: ruleParenthesizedTerminalElement returns [EObject current=null] : ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2083:1: ruleParenthesizedTerminalElement returns [EObject current=null] : ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' ) ;
public final EObject ruleParenthesizedTerminalElement() throws RecognitionException {
EObject current = null;
@@ -4902,23 +4958,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2066:6: ( ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2067:1: ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2088:6: ( ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2089:1: ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2067:1: ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2067:2: ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2089:1: ( ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2089:2: ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives ) ')'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2067:2: ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2067:3: '(' this_TerminalAlternatives_1= ruleTerminalAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2089:2: ( '(' this_TerminalAlternatives_1= ruleTerminalAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2089:3: '(' this_TerminalAlternatives_1= ruleTerminalAlternatives
{
- match(input,14,FOLLOW_14_in_ruleParenthesizedTerminalElement4707);
+ match(input,15,FOLLOW_15_in_ruleParenthesizedTerminalElement4751);
createLeafNode(grammarAccess.prParenthesizedTerminalElement().ele00KeywordLeftParenthesis(), null);
currentNode=createCompositeNode(grammarAccess.prParenthesizedTerminalElement().ele01ParserRuleCallTerminalAlternatives(), currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4729);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4773);
this_TerminalAlternatives_1=ruleTerminalAlternatives();
_fsp--;
@@ -4932,7 +4988,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
}
- match(input,16,FOLLOW_16_in_ruleParenthesizedTerminalElement4745);
+ match(input,16,FOLLOW_16_in_ruleParenthesizedTerminalElement4789);
createLeafNode(grammarAccess.prParenthesizedTerminalElement().ele1KeywordRightParenthesis(), null);
@@ -4959,7 +5015,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleKeyword
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2095:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2117:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
public final EObject entryRuleKeyword() throws RecognitionException {
EObject current = null;
@@ -4967,16 +5023,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2095:49: (iv_ruleKeyword= ruleKeyword EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2096:2: iv_ruleKeyword= ruleKeyword EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2117:49: (iv_ruleKeyword= ruleKeyword EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2118:2: iv_ruleKeyword= ruleKeyword EOF
{
currentNode = createCompositeNode(grammarAccess.prKeyword().getRule(), currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword4778);
+ pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword4822);
iv_ruleKeyword=ruleKeyword();
_fsp--;
current =iv_ruleKeyword;
- match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword4788);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword4832);
}
@@ -4994,7 +5050,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleKeyword
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2103:1: ruleKeyword returns [EObject current=null] : (lv_value_0= RULE_STRING ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2125:1: ruleKeyword returns [EObject current=null] : (lv_value_0= RULE_STRING ) ;
public final EObject ruleKeyword() throws RecognitionException {
EObject current = null;
@@ -5003,14 +5059,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2108:6: ( (lv_value_0= RULE_STRING ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2109:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2130:6: ( (lv_value_0= RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2131:1: (lv_value_0= RULE_STRING )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2109:1: (lv_value_0= RULE_STRING )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2111:6: lv_value_0= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2131:1: (lv_value_0= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2133:6: lv_value_0= RULE_STRING
{
lv_value_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword4834);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword4878);
createLeafNode(grammarAccess.prKeyword().ele0TerminalRuleCallSTRING(), "value");
@@ -5049,7 +5105,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start entryRuleRuleCall
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2136:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2158:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
public final EObject entryRuleRuleCall() throws RecognitionException {
EObject current = null;
@@ -5057,16 +5113,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2136:50: (iv_ruleRuleCall= ruleRuleCall EOF )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2137:2: iv_ruleRuleCall= ruleRuleCall EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2158:50: (iv_ruleRuleCall= ruleRuleCall EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2159:2: iv_ruleRuleCall= ruleRuleCall EOF
{
currentNode = createCompositeNode(grammarAccess.prRuleCall().getRule(), currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall4874);
+ pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall4918);
iv_ruleRuleCall=ruleRuleCall();
_fsp--;
current =iv_ruleRuleCall;
- match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall4884);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall4928);
}
@@ -5084,18 +5140,18 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
// $ANTLR start ruleRuleCall
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2144:1: ruleRuleCall returns [EObject current=null] : ( RULE_ID ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2166:1: ruleRuleCall returns [EObject current=null] : ( RULE_ID ) ;
public final EObject ruleRuleCall() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2149:6: ( ( RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2150:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2171:6: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2172:1: ( RULE_ID )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2150:1: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2153:3: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2172:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g:2175:3: RULE_ID
{
if (current==null) {
@@ -5103,7 +5159,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall4930);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall4974);
createLeafNode(grammarAccess.prRuleCall().ele0CrossReferenceEStringAbstractRule(), "rule");
@@ -5134,177 +5190,179 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractInternalAntl
public static final BitSet FOLLOW_ruleGrammar_in_entryRuleGrammar71 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleGrammar81 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_11_in_ruleGrammar119 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleGrammarID_in_ruleGrammar153 = new BitSet(new long[]{0x0000000001143010L});
- public static final BitSet FOLLOW_12_in_ruleGrammar168 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleGrammarID_in_ruleGrammar195 = new BitSet(new long[]{0x0000000001142010L});
- public static final BitSet FOLLOW_13_in_ruleGrammar225 = new BitSet(new long[]{0x0000000000004000L});
- public static final BitSet FOLLOW_14_in_ruleGrammar247 = new BitSet(new long[]{0x0000000000010010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGrammar271 = new BitSet(new long[]{0x0000000000018000L});
- public static final BitSet FOLLOW_15_in_ruleGrammar284 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGrammar306 = new BitSet(new long[]{0x0000000000018000L});
- public static final BitSet FOLLOW_16_in_ruleGrammar323 = new BitSet(new long[]{0x0000000001140010L});
- public static final BitSet FOLLOW_ruleAbstractMetamodelDeclaration_in_ruleGrammar360 = new BitSet(new long[]{0x0000000001140010L});
- public static final BitSet FOLLOW_ruleAbstractRule_in_ruleGrammar400 = new BitSet(new long[]{0x0000000001000012L});
- public static final BitSet FOLLOW_ruleGrammarID_in_entryRuleGrammarID439 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGrammarID450 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGrammarID490 = new BitSet(new long[]{0x0000000000020002L});
- public static final BitSet FOLLOW_17_in_ruleGrammarID509 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGrammarID524 = new BitSet(new long[]{0x0000000000020002L});
- public static final BitSet FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule569 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractRule579 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParserRule_in_ruleAbstractRule626 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalRule_in_ruleAbstractRule660 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration699 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractMetamodelDeclaration709 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGeneratedMetamodel_in_ruleAbstractMetamodelDeclaration756 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReferencedMetamodel_in_ruleAbstractMetamodelDeclaration790 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel829 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGeneratedMetamodel839 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_ruleGeneratedMetamodel875 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGeneratedMetamodel897 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel928 = new BitSet(new long[]{0x0000000000080002L});
- public static final BitSet FOLLOW_19_in_ruleGeneratedMetamodel942 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGeneratedMetamodel964 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel1007 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleReferencedMetamodel1017 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_ruleReferencedMetamodel1052 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleReferencedMetamodel1074 = new BitSet(new long[]{0x0000000000080002L});
- public static final BitSet FOLLOW_19_in_ruleReferencedMetamodel1088 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleReferencedMetamodel1110 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParserRule_in_entryRuleParserRule1153 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParserRule1163 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1214 = new BitSet(new long[]{0x0000000000602000L});
- public static final BitSet FOLLOW_21_in_ruleParserRule1232 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleParserRule1266 = new BitSet(new long[]{0x0000000000402000L});
- public static final BitSet FOLLOW_13_in_ruleParserRule1297 = new BitSet(new long[]{0x0000000000004000L});
- public static final BitSet FOLLOW_14_in_ruleParserRule1319 = new BitSet(new long[]{0x0000000000010010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1343 = new BitSet(new long[]{0x0000000000018000L});
- public static final BitSet FOLLOW_15_in_ruleParserRule1356 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1378 = new BitSet(new long[]{0x0000000000018000L});
- public static final BitSet FOLLOW_16_in_ruleParserRule1395 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleParserRule1407 = new BitSet(new long[]{0x0000008200004030L});
- public static final BitSet FOLLOW_ruleAlternatives_in_ruleParserRule1442 = new BitSet(new long[]{0x0000000000800000L});
- public static final BitSet FOLLOW_23_in_ruleParserRule1456 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1489 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalRule1499 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_ruleTerminalRule1537 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTerminalRule1559 = new BitSet(new long[]{0x0000000000600000L});
- public static final BitSet FOLLOW_21_in_ruleTerminalRule1578 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleTerminalRule1612 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleTerminalRule1628 = new BitSet(new long[]{0x0000003000024030L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1663 = new BitSet(new long[]{0x0000000000800000L});
- public static final BitSet FOLLOW_23_in_ruleTerminalRule1677 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef1710 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef1720 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1768 = new BitSet(new long[]{0x0000000002000000L});
- public static final BitSet FOLLOW_25_in_ruleTypeRef1780 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1804 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAlternatives_in_entryRuleAlternatives1840 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAlternatives1850 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives1897 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_26_in_ruleAlternatives1923 = new BitSet(new long[]{0x0000008200004030L});
- public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives1958 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives1997 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalAlternatives2007 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2054 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_26_in_ruleTerminalAlternatives2080 = new BitSet(new long[]{0x0000003000024030L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2115 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_ruleGroup_in_entryRuleGroup2154 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGroup2164 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2211 = new BitSet(new long[]{0x0000008200004032L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2261 = new BitSet(new long[]{0x0000008200004032L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2300 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalGroup2310 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2357 = new BitSet(new long[]{0x0000003000024032L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2407 = new BitSet(new long[]{0x0000003000024032L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2446 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractToken2456 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAssignment_in_ruleAbstractToken2505 = new BitSet(new long[]{0x0000000038000002L});
- public static final BitSet FOLLOW_ruleAction_in_ruleAbstractToken2539 = new BitSet(new long[]{0x0000000038000002L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2574 = new BitSet(new long[]{0x0000000038000002L});
- public static final BitSet FOLLOW_27_in_ruleAbstractToken2604 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_28_in_ruleAbstractToken2620 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_29_in_ruleAbstractToken2638 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2687 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalToken2697 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2744 = new BitSet(new long[]{0x0000000038000002L});
- public static final BitSet FOLLOW_27_in_ruleTerminalToken2773 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_28_in_ruleTerminalToken2789 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_29_in_ruleTerminalToken2807 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAssignment_in_entryRuleAssignment2856 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAssignment2866 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAssignment2914 = new BitSet(new long[]{0x00000001C0000000L});
- public static final BitSet FOLLOW_30_in_ruleAssignment2945 = new BitSet(new long[]{0x0000008000004030L});
- public static final BitSet FOLLOW_31_in_ruleAssignment2961 = new BitSet(new long[]{0x0000008000004030L});
- public static final BitSet FOLLOW_32_in_ruleAssignment2979 = new BitSet(new long[]{0x0000008000004030L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAssignment3029 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAction_in_entryRuleAction3066 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAction3076 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_33_in_ruleAction3116 = new BitSet(new long[]{0x0000000400000010L});
- public static final BitSet FOLLOW_34_in_ruleAction3126 = new BitSet(new long[]{0x0000000080000000L});
- public static final BitSet FOLLOW_31_in_ruleAction3135 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleAction3172 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleAction3186 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAction3209 = new BitSet(new long[]{0x00000000C0000000L});
- public static final BitSet FOLLOW_31_in_ruleAction3240 = new BitSet(new long[]{0x0000000400000000L});
- public static final BitSet FOLLOW_30_in_ruleAction3256 = new BitSet(new long[]{0x0000000400000000L});
- public static final BitSet FOLLOW_34_in_ruleAction3281 = new BitSet(new long[]{0x0000000800000000L});
- public static final BitSet FOLLOW_35_in_ruleAction3291 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3324 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractTerminal3334 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleAbstractTerminal3383 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3417 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3452 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3487 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3526 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalTokenElement3536 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3586 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3620 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3655 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3690 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3725 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3764 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3774 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3821 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3855 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3894 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3904 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_36_in_ruleNegatedToken3938 = new BitSet(new long[]{0x0000003000024030L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken3972 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4009 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4019 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_37_in_ruleUpToToken4053 = new BitSet(new long[]{0x0000003000024030L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4087 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4124 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4134 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_ruleWildcard4179 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4224 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleCharacterRange4234 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4281 = new BitSet(new long[]{0x0000004000000002L});
- public static final BitSet FOLLOW_38_in_ruleCharacterRange4307 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4342 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCrossReference_in_entryRuleCrossReference4381 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleCrossReference4391 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_39_in_ruleCrossReference4427 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleCrossReference4461 = new BitSet(new long[]{0x0000010004000000L});
- public static final BitSet FOLLOW_26_in_ruleCrossReference4476 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleCrossReference4498 = new BitSet(new long[]{0x0000010000000000L});
- public static final BitSet FOLLOW_40_in_ruleCrossReference4513 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4546 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement4556 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleParenthesizedElement4591 = new BitSet(new long[]{0x0000008200004030L});
- public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4613 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_16_in_ruleParenthesizedElement4629 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4662 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4672 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleParenthesizedTerminalElement4707 = new BitSet(new long[]{0x0000003000024030L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4729 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_16_in_ruleParenthesizedTerminalElement4745 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword4778 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleKeyword4788 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword4834 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall4874 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall4884 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall4930 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleGrammarID_in_ruleGrammar153 = new BitSet(new long[]{0x0000000001145010L});
+ public static final BitSet FOLLOW_12_in_ruleGrammar169 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleGrammarID_in_ruleGrammar196 = new BitSet(new long[]{0x0000000001146010L});
+ public static final BitSet FOLLOW_13_in_ruleGrammar210 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleGrammarID_in_ruleGrammar237 = new BitSet(new long[]{0x0000000001146010L});
+ public static final BitSet FOLLOW_14_in_ruleGrammar269 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleGrammar291 = new BitSet(new long[]{0x0000000000010010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGrammar315 = new BitSet(new long[]{0x0000000000012000L});
+ public static final BitSet FOLLOW_13_in_ruleGrammar328 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGrammar350 = new BitSet(new long[]{0x0000000000012000L});
+ public static final BitSet FOLLOW_16_in_ruleGrammar367 = new BitSet(new long[]{0x0000000001140010L});
+ public static final BitSet FOLLOW_ruleAbstractMetamodelDeclaration_in_ruleGrammar404 = new BitSet(new long[]{0x0000000001140010L});
+ public static final BitSet FOLLOW_ruleAbstractRule_in_ruleGrammar444 = new BitSet(new long[]{0x0000000001000012L});
+ public static final BitSet FOLLOW_ruleGrammarID_in_entryRuleGrammarID483 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleGrammarID494 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGrammarID534 = new BitSet(new long[]{0x0000000000020002L});
+ public static final BitSet FOLLOW_17_in_ruleGrammarID553 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGrammarID568 = new BitSet(new long[]{0x0000000000020002L});
+ public static final BitSet FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule613 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractRule623 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParserRule_in_ruleAbstractRule670 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalRule_in_ruleAbstractRule704 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration743 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractMetamodelDeclaration753 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleGeneratedMetamodel_in_ruleAbstractMetamodelDeclaration800 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReferencedMetamodel_in_ruleAbstractMetamodelDeclaration834 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel873 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleGeneratedMetamodel883 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleGeneratedMetamodel919 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGeneratedMetamodel941 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel972 = new BitSet(new long[]{0x0000000000080002L});
+ public static final BitSet FOLLOW_19_in_ruleGeneratedMetamodel986 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleGeneratedMetamodel1008 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel1051 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleReferencedMetamodel1061 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_20_in_ruleReferencedMetamodel1096 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleReferencedMetamodel1118 = new BitSet(new long[]{0x0000000000080002L});
+ public static final BitSet FOLLOW_19_in_ruleReferencedMetamodel1132 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReferencedMetamodel1154 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParserRule_in_entryRuleParserRule1197 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParserRule1207 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1258 = new BitSet(new long[]{0x0000000000604000L});
+ public static final BitSet FOLLOW_21_in_ruleParserRule1276 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleParserRule1310 = new BitSet(new long[]{0x0000000000404000L});
+ public static final BitSet FOLLOW_14_in_ruleParserRule1341 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleParserRule1363 = new BitSet(new long[]{0x0000000000010010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1387 = new BitSet(new long[]{0x0000000000012000L});
+ public static final BitSet FOLLOW_13_in_ruleParserRule1400 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1422 = new BitSet(new long[]{0x0000000000012000L});
+ public static final BitSet FOLLOW_16_in_ruleParserRule1439 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleParserRule1451 = new BitSet(new long[]{0x0000008200008030L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_ruleParserRule1486 = new BitSet(new long[]{0x0000000000800000L});
+ public static final BitSet FOLLOW_23_in_ruleParserRule1500 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1533 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalRule1543 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_ruleTerminalRule1581 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTerminalRule1603 = new BitSet(new long[]{0x0000000000600000L});
+ public static final BitSet FOLLOW_21_in_ruleTerminalRule1622 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleTerminalRule1656 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleTerminalRule1672 = new BitSet(new long[]{0x0000003000028030L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1707 = new BitSet(new long[]{0x0000000000800000L});
+ public static final BitSet FOLLOW_23_in_ruleTerminalRule1721 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef1754 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef1764 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1812 = new BitSet(new long[]{0x0000000002000000L});
+ public static final BitSet FOLLOW_25_in_ruleTypeRef1824 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1848 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_entryRuleAlternatives1884 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAlternatives1894 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives1941 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_26_in_ruleAlternatives1967 = new BitSet(new long[]{0x0000008200008030L});
+ public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives2002 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2041 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalAlternatives2051 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2098 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_26_in_ruleTerminalAlternatives2124 = new BitSet(new long[]{0x0000003000028030L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2159 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_ruleGroup_in_entryRuleGroup2198 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleGroup2208 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2255 = new BitSet(new long[]{0x0000008200008032L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2305 = new BitSet(new long[]{0x0000008200008032L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2344 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalGroup2354 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2401 = new BitSet(new long[]{0x0000003000028032L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2451 = new BitSet(new long[]{0x0000003000028032L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2490 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractToken2500 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAssignment_in_ruleAbstractToken2549 = new BitSet(new long[]{0x0000000038000002L});
+ public static final BitSet FOLLOW_ruleAction_in_ruleAbstractToken2583 = new BitSet(new long[]{0x0000000038000002L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2618 = new BitSet(new long[]{0x0000000038000002L});
+ public static final BitSet FOLLOW_27_in_ruleAbstractToken2648 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_28_in_ruleAbstractToken2664 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_29_in_ruleAbstractToken2682 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2731 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalToken2741 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2788 = new BitSet(new long[]{0x0000000038000002L});
+ public static final BitSet FOLLOW_27_in_ruleTerminalToken2817 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_28_in_ruleTerminalToken2833 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_29_in_ruleTerminalToken2851 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAssignment_in_entryRuleAssignment2900 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAssignment2910 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAssignment2958 = new BitSet(new long[]{0x00000001C0000000L});
+ public static final BitSet FOLLOW_30_in_ruleAssignment2989 = new BitSet(new long[]{0x0000008000008030L});
+ public static final BitSet FOLLOW_31_in_ruleAssignment3005 = new BitSet(new long[]{0x0000008000008030L});
+ public static final BitSet FOLLOW_32_in_ruleAssignment3023 = new BitSet(new long[]{0x0000008000008030L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAssignment3073 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAction_in_entryRuleAction3110 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAction3120 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_33_in_ruleAction3160 = new BitSet(new long[]{0x0000000400000010L});
+ public static final BitSet FOLLOW_34_in_ruleAction3170 = new BitSet(new long[]{0x0000000080000000L});
+ public static final BitSet FOLLOW_31_in_ruleAction3179 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleAction3216 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleAction3230 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAction3253 = new BitSet(new long[]{0x00000000C0000000L});
+ public static final BitSet FOLLOW_31_in_ruleAction3284 = new BitSet(new long[]{0x0000000400000000L});
+ public static final BitSet FOLLOW_30_in_ruleAction3300 = new BitSet(new long[]{0x0000000400000000L});
+ public static final BitSet FOLLOW_34_in_ruleAction3325 = new BitSet(new long[]{0x0000000800000000L});
+ public static final BitSet FOLLOW_35_in_ruleAction3335 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3368 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractTerminal3378 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleAbstractTerminal3427 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3461 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3496 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3531 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3570 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalTokenElement3580 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3630 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3664 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3699 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3734 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3769 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3808 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3818 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3865 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3899 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3938 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3948 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_36_in_ruleNegatedToken3982 = new BitSet(new long[]{0x0000003000028030L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4016 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4053 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4063 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_37_in_ruleUpToToken4097 = new BitSet(new long[]{0x0000003000028030L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4131 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4168 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_17_in_ruleWildcard4223 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4268 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleCharacterRange4278 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4325 = new BitSet(new long[]{0x0000004000000002L});
+ public static final BitSet FOLLOW_38_in_ruleCharacterRange4351 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4386 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCrossReference_in_entryRuleCrossReference4425 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleCrossReference4435 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_39_in_ruleCrossReference4471 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleCrossReference4505 = new BitSet(new long[]{0x0000010004000000L});
+ public static final BitSet FOLLOW_26_in_ruleCrossReference4520 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleCrossReference4542 = new BitSet(new long[]{0x0000010000000000L});
+ public static final BitSet FOLLOW_40_in_ruleCrossReference4557 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4590 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement4600 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleParenthesizedElement4635 = new BitSet(new long[]{0x0000008200008030L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4657 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleParenthesizedElement4673 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4706 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4716 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleParenthesizedTerminalElement4751 = new BitSet(new long[]{0x0000003000028030L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4773 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleParenthesizedTerminalElement4789 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword4822 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleKeyword4832 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword4878 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall4918 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall4928 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall4974 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
index fa89c08..590515f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
@@ -8,10 +8,10 @@ import org.eclipse.xtext.parser.antlr.Lexer;
}
T11 : 'grammar' ;
-T12 : 'extends' ;
-T13 : 'hidden' ;
-T14 : '(' ;
-T15 : ',' ;
+T12 : 'with' ;
+T13 : ',' ;
+T14 : 'hidden' ;
+T15 : '(' ;
T16 : ')' ;
T17 : '.' ;
T18 : 'generate' ;
@@ -38,25 +38,25 @@ T38 : '..' ;
T39 : '[' ;
T40 : ']' ;
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2171
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2193
RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2173
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2195
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2175
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2197
RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2177
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2199
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2179
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2201
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2181
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2203
RULE_WS : (((' '|'\t')|'\r')|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2183
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2205
RULE_ANY_OTHER : .;
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 2649ac6..9c08ab3 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage" usedGrammars="/1">
<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/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java
index 1d3a403..d5d1290 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class DatatypeRulesTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java
index 336fcdd..3ee4831 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers.DatatypeRulesTestLanguageCompositeModelConsumer;
import org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers.DatatypeRulesTestLanguageModelConsumer;
import org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers.DatatypeRulesTestLanguageModelIdConsumer;
@@ -28,7 +27,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class DatatypeRulesTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private DatatypeRulesTestLanguageCompositeModelConsumer compositeModelConsumer;
private DatatypeRulesTestLanguageModelConsumer modelConsumer;
private DatatypeRulesTestLanguageModelIdConsumer modelIdConsumer;
@@ -132,7 +130,6 @@ public class DatatypeRulesTestLanguageParserConfiguration extends AbstractParser
getDotsConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.parser.datatyperules.parser.packrat.DatatypeRulesTestLanguageDelimiters.keyword$15$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
index 19630e0..11ba27e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
@@ -268,12 +268,13 @@ public class DatatypeRulesTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public DatatypeRulesTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public DatatypeRulesTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -281,8 +282,8 @@ public class DatatypeRulesTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -323,36 +324,36 @@ public class DatatypeRulesTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
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 9068294..c1a61d7 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.parser.epatch.EpatchTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.parser.epatch.EpatchTestLanguage" usedGrammars="/1">
<metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="epatchTestLanguage">
<ePackage href="http://www.eclipse.org/2008/tmf/xtext/EpatchTestLanguage#/"/>
</metamodelDeclarations>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java
index 32fa4d2..2759c98 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class EpatchTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
index 9bfcfa4..00e81eb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.parser.epatch.parser.packrat.consumers.EpatchTestLanguageEPatchConsumer;
import org.eclipse.xtext.parser.epatch.parser.packrat.consumers.EpatchTestLanguageImportConsumer;
import org.eclipse.xtext.parser.epatch.parser.packrat.consumers.EpatchTestLanguageModelImportConsumer;
@@ -47,7 +46,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class EpatchTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private EpatchTestLanguageEPatchConsumer ePatchConsumer;
private EpatchTestLanguageImportConsumer importConsumer;
private EpatchTestLanguageModelImportConsumer modelImportConsumer;
@@ -423,7 +421,6 @@ public class EpatchTestLanguageParserConfiguration extends AbstractParserConfigu
getExpressionExecutableConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.parser.epatch.parser.packrat.EpatchTestLanguageDelimiters.ruleCall$42$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java
index 6e9c3ca..de4e6bf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java
@@ -1729,12 +1729,13 @@ public class EpatchTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public EpatchTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public EpatchTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -1742,8 +1743,8 @@ public class EpatchTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -1879,36 +1880,36 @@ public class EpatchTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
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 3c97541..ee7dc56 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI 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">
- <xtext:Grammar name="org.eclipse.xtext.parser.keywords.KeywordsTestLanguage" superGrammar="/1">
+ <xtext:Grammar name="org.eclipse.xtext.parser.keywords.KeywordsTestLanguage" usedGrammars="/1">
<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/KeywordsTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java
index 6b9c0c3..e4238df 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java
@@ -19,7 +19,6 @@ public class KeywordsTestLanguageStandaloneSetup implements ISetup {
}
public Injector createInjectorAndDoEMFRegistration() {
-
org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java
index 35516b0..1520164 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.keywords.services.KeywordsTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.parser.keywords.parser.packrat.consumers.KeywordsTestLanguageModelConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
@@ -22,7 +21,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class KeywordsTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private KeywordsTestLanguageModelConsumer modelConsumer;
private KeywordsTestLanguageGrammarAccess grammarAccess;
@@ -67,7 +65,6 @@ public class KeywordsTestLanguageParserConfiguration extends AbstractParserConfi
getModelConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.keywords.parser.packrat.KeywordsTestLanguageDelimiters.keyword$7$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
index 96572cc..d0cc0cf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
@@ -72,12 +72,13 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private TerminalsGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess terminalsGrammarAccess;
@Inject
- public KeywordsTestLanguageGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
+ public KeywordsTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess terminalsGrammarAccess) {
this.grammarProvider = grammarProvider;
- this.superGrammarAccess = superGrammarAccess;
+ this.terminalsGrammarAccess = terminalsGrammarAccess;
}
public Grammar getGrammar() {
@@ -85,8 +86,8 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess {
}
- public TerminalsGrammarAccess getSuperGrammarAccess() {
- return superGrammarAccess;
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return terminalsGrammarAccess;
}
@@ -97,36 +98,36 @@ public class KeywordsTestLanguageGrammarAccess implements IGrammarAccess {
// not supported
public TerminalRule trID() {
- return superGrammarAccess.trID();
+ return terminalsGrammarAccess.trID();
}
// not supported
public TerminalRule trINT() {
- return superGrammarAccess.trINT();
+ return terminalsGrammarAccess.trINT();
}
// not supported
public TerminalRule trSTRING() {
- return superGrammarAccess.trSTRING();
+ return terminalsGrammarAccess.trSTRING();
}
// not supported
public TerminalRule trML_COMMENT() {
- return superGrammarAccess.trML_COMMENT();
+ return terminalsGrammarAccess.trML_COMMENT();
}
// not supported
public TerminalRule trSL_COMMENT() {
- return superGrammarAccess.trSL_COMMENT();
+ return terminalsGrammarAccess.trSL_COMMENT();
}
// not supported
public TerminalRule trWS() {
- return superGrammarAccess.trWS();
+ return terminalsGrammarAccess.trWS();
}
// not supported
public TerminalRule trANY_OTHER() {
- return superGrammarAccess.trANY_OTHER();
+ return terminalsGrammarAccess.trANY_OTHER();
}
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java
index ce56e3b..049c48d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageDelimiters.java
@@ -13,10 +13,10 @@ public final class XtextGrammarTestLanguageDelimiters {
throw new UnsupportedOperationException("Utility classes may not be initialized");
}
- public static final ISequenceMatcher crossReference$25$Delimiter = new SetBasedKeywordMatcher(
- "grammar", "extends", "hidden", "generate", "as", "import", "returns", "terminal", "current");
+ public static final ISequenceMatcher crossReference$31$Delimiter = new SetBasedKeywordMatcher(
+ "grammar", "with", "hidden", "generate", "as", "import", "returns", "terminal", "current");
- public static final ICharacterClass keyword$22$Delimiter = ICharacterClass.Factory.nullClass();
+ public static final ICharacterClass keyword$19$Delimiter = ICharacterClass.Factory.nullClass();
// TODO: remove hardcoded character class from template
public static final ICharacterClass keyword$9$Delimiter = ICharacterClass.Factory.join(
@@ -26,6 +26,6 @@ public final class XtextGrammarTestLanguageDelimiters {
ICharacterClass.Factory.createRange('0', '9')
);
- public static final ISequenceMatcher crossReference$63$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ public static final ISequenceMatcher crossReference$69$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java
index ab25f53..b6baeaf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java
@@ -9,7 +9,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
-
import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageGrammarConsumer;
import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageGrammarIDConsumer;
import org.eclipse.xtext.parser.packrat.consumers.XtextGrammarTestLanguageAbstractRuleConsumer;
@@ -50,7 +49,6 @@ import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsu
public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
-
private XtextGrammarTestLanguageGrammarConsumer grammarConsumer;
private XtextGrammarTestLanguageGrammarIDConsumer grammarIdConsumer;
private XtextGrammarTestLanguageAbstractRuleConsumer abstractRuleConsumer;
@@ -309,82 +307,82 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC
getRuleCallConsumer().setIdConsumer(getIdConsumer());
- getGrammarConsumer().setCrossReference$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getGrammarConsumer().setCrossReference$27$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getGrammarConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getGrammarConsumer().setKeyword$18$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getGrammarConsumer().setKeyword$19$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getGrammarConsumer().setKeyword$25$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getGrammarConsumer().setKeyword$29$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
+ getGrammarConsumer().setCrossReference$28$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getGrammarConsumer().setCrossReference$33$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getGrammarConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
+ getGrammarConsumer().setKeyword$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getGrammarConsumer().setKeyword$24$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
+ getGrammarConsumer().setKeyword$25$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getGrammarConsumer().setKeyword$31$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getGrammarConsumer().setKeyword$35$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
getGrammarConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getGrammarIdConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getGrammarIdConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getGrammarIdConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getGeneratedMetamodelConsumer().setCrossReference$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$63$Delimiter);
+ getGrammarIdConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getGrammarIdConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getGrammarIdConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getGeneratedMetamodelConsumer().setCrossReference$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$69$Delimiter);
getGeneratedMetamodelConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
getGeneratedMetamodelConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getGeneratedMetamodelConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getGeneratedMetamodelConsumer().setRuleCall$13$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getReferencedMetamodelConsumer().setCrossReference$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$63$Delimiter);
+ getGeneratedMetamodelConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getGeneratedMetamodelConsumer().setRuleCall$13$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getReferencedMetamodelConsumer().setCrossReference$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$69$Delimiter);
getReferencedMetamodelConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
getReferencedMetamodelConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getReferencedMetamodelConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getParserRuleConsumer().setCrossReference$20$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getParserRuleConsumer().setCrossReference$25$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getParserRuleConsumer().setKeyword$23$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParserRuleConsumer().setKeyword$27$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParserRuleConsumer().setKeyword$28$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParserRuleConsumer().setKeyword$31$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParserRuleConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
+ getReferencedMetamodelConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getParserRuleConsumer().setCrossReference$20$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getParserRuleConsumer().setCrossReference$25$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
getParserRuleConsumer().setKeyword$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getParserRuleConsumer().setKeyword$17$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParserRuleConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
+ getParserRuleConsumer().setKeyword$17$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParserRuleConsumer().setKeyword$23$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParserRuleConsumer().setKeyword$27$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParserRuleConsumer().setKeyword$28$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParserRuleConsumer().setKeyword$31$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParserRuleConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
+ getParserRuleConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
getTerminalRuleConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
getTerminalRuleConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getTerminalRuleConsumer().setKeyword$13$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalRuleConsumer().setKeyword$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalRuleConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getTypeRefConsumer().setCrossReference$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getTypeRefConsumer().setCrossReference$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getTypeRefConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAlternativesConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalAlternativesConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAbstractTokenConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAbstractTokenConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAbstractTokenConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalTokenConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalTokenConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getTerminalTokenConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAssignmentConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAssignmentConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAssignmentConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getAssignmentConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getActionConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
+ getTerminalRuleConsumer().setKeyword$13$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalRuleConsumer().setKeyword$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalRuleConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getTypeRefConsumer().setCrossReference$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getTypeRefConsumer().setCrossReference$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getTypeRefConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAlternativesConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalAlternativesConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAbstractTokenConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAbstractTokenConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAbstractTokenConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalTokenConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalTokenConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getTerminalTokenConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAssignmentConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAssignmentConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAssignmentConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getAssignmentConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getActionConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
getActionConsumer().setKeyword$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getActionConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getActionConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getActionConsumer().setKeyword$19$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getActionConsumer().setKeyword$20$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
+ getActionConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getActionConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getActionConsumer().setKeyword$19$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getActionConsumer().setKeyword$20$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
getActionConsumer().setKeyword$21$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$9$Delimiter);
- getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
- getCrossReferenceConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getCrossReferenceConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getCrossReferenceConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParenthesizedElementConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParenthesizedElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParenthesizedTerminalElementConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getParenthesizedTerminalElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$22$Delimiter);
- getKeywordConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$63$Delimiter);
- getRuleCallConsumer().setCrossReference$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$25$Delimiter);
+ getActionConsumer().setKeyword$22$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getActionConsumer().setRuleCall$16$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getNegatedTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getUpToTokenConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getWildcardConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getCharacterRangeConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getCrossReferenceConsumer().setCrossReference$10$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
+ getCrossReferenceConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getCrossReferenceConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getCrossReferenceConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParenthesizedElementConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParenthesizedElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParenthesizedTerminalElementConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getParenthesizedTerminalElementConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.keyword$19$Delimiter);
+ getKeywordConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$69$Delimiter);
+ getRuleCallConsumer().setCrossReference$2$Delimiter(org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguageDelimiters.crossReference$31$Delimiter);
}
- // TODO collect superGrammars transitive
public TerminalsParserConfiguration getTerminalsConfiguration() {
return terminalsConfiguration;
}
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 30cb00b..24b6beb 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
@@ -44,57 +44,67 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
private IElementConsumer group$9$Consumer;
- private IElementConsumer keyword$10$Consumer;
+ private IElementConsumer keyword$11$Consumer;
- private IElementConsumer assignment$11$Consumer;
+ private IElementConsumer assignment$12$Consumer;
- private IElementConsumer crossReference$12$Consumer;
+ private IElementConsumer crossReference$13$Consumer;
- private IElementConsumer group$14$Consumer;
+ private IElementConsumer group$15$Consumer;
- private IElementConsumer assignment$17$Consumer;
+ private IElementConsumer keyword$16$Consumer;
- private IElementConsumer keyword$18$Consumer;
+ private IElementConsumer assignment$17$Consumer;
- private IElementConsumer keyword$19$Consumer;
+ private IElementConsumer crossReference$18$Consumer;
private IElementConsumer group$20$Consumer;
- private IElementConsumer assignment$21$Consumer;
-
- private IElementConsumer crossReference$22$Consumer;
+ private IElementConsumer assignment$23$Consumer;
- private IElementConsumer group$24$Consumer;
+ private IElementConsumer keyword$24$Consumer;
private IElementConsumer keyword$25$Consumer;
- private IElementConsumer assignment$26$Consumer;
+ private IElementConsumer group$26$Consumer;
- private IElementConsumer crossReference$27$Consumer;
+ private IElementConsumer assignment$27$Consumer;
- private IElementConsumer keyword$29$Consumer;
+ private IElementConsumer crossReference$28$Consumer;
- private IElementConsumer assignment$30$Consumer;
+ private IElementConsumer group$30$Consumer;
- private IElementConsumer ruleCall$31$Consumer;
+ private IElementConsumer keyword$31$Consumer;
private IElementConsumer assignment$32$Consumer;
- private IElementConsumer ruleCall$33$Consumer;
+ private IElementConsumer crossReference$33$Consumer;
+
+ private IElementConsumer keyword$35$Consumer;
+
+ private IElementConsumer assignment$36$Consumer;
- private ISequenceMatcher crossReference$22$Delimiter;
+ private IElementConsumer ruleCall$37$Consumer;
- private ISequenceMatcher crossReference$27$Delimiter;
+ private IElementConsumer assignment$38$Consumer;
- private ICharacterClass keyword$10$Delimiter;
+ private IElementConsumer ruleCall$39$Consumer;
- private ICharacterClass keyword$18$Delimiter;
+ private ISequenceMatcher crossReference$28$Delimiter;
- private ICharacterClass keyword$19$Delimiter;
+ private ISequenceMatcher crossReference$33$Delimiter;
+
+ private ICharacterClass keyword$11$Delimiter;
+
+ private ICharacterClass keyword$16$Delimiter;
+
+ private ICharacterClass keyword$24$Delimiter;
private ICharacterClass keyword$25$Delimiter;
- private ICharacterClass keyword$29$Delimiter;
+ private ICharacterClass keyword$31$Delimiter;
+
+ private ICharacterClass keyword$35$Delimiter;
private ICharacterClass keyword$6$Delimiter;
@@ -109,9 +119,9 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
acceptor.accept(keyword$6$Consumer);
acceptor.accept(assignment$7$Consumer);
acceptor.accept(group$9$Consumer);
- acceptor.accept(group$14$Consumer);
- acceptor.accept(assignment$30$Consumer);
- acceptor.accept(assignment$32$Consumer);
+ acceptor.accept(group$20$Consumer);
+ acceptor.accept(assignment$36$Consumer);
+ acceptor.accept(assignment$38$Consumer);
}
}
@@ -159,59 +169,70 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
@Override
protected void doGetConsumers(ConsumerAcceptor acceptor) {
- acceptor.accept(keyword$10$Consumer);
- acceptor.accept(assignment$11$Consumer);
+ acceptor.accept(keyword$11$Consumer);
+ acceptor.accept(assignment$12$Consumer);
+ acceptor.accept(group$15$Consumer);
}
}
- protected class Keyword$10$Consumer extends ElementConsumer<Keyword> {
+ protected class Keyword$11$Consumer extends ElementConsumer<Keyword> {
- protected Keyword$10$Consumer(final Keyword keyword) {
+ protected Keyword$11$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), null, false, false, getKeyword$10$Delimiter(), optional);
+ return consumeKeyword(getElement(), null, false, false, getKeyword$11$Delimiter(), optional);
}
}
- protected class Assignment$11$Consumer extends AssignmentConsumer {
+ protected class Assignment$12$Consumer extends AssignmentConsumer {
- protected Assignment$11$Consumer(final Assignment assignment) {
+ protected Assignment$12$Consumer(final Assignment assignment) {
super(assignment);
}
@Override
protected IElementConsumer getConsumer() {
- return crossReference$12$Consumer;
+ return crossReference$13$Consumer;
}
}
- protected class CrossReference$12$Consumer extends ElementConsumer<CrossReference> {
+ protected class CrossReference$13$Consumer extends ElementConsumer<CrossReference> {
- protected CrossReference$12$Consumer(final CrossReference crossReference) {
+ protected CrossReference$13$Consumer(final CrossReference crossReference) {
super(crossReference);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeNonTerminal(grammarIdConsumer, "superGrammar", false, true, false, getElement(), optional);
+ return consumeNonTerminal(grammarIdConsumer, "usedGrammars", true, true, false, getElement(), optional);
}
}
- protected class Group$14$Consumer extends OptionalGroupConsumer {
+ protected class Group$15$Consumer extends LoopGroupConsumer {
- protected Group$14$Consumer(final Group group) {
+ protected Group$15$Consumer(final Group group) {
super(group);
}
@Override
protected void doGetConsumers(ConsumerAcceptor acceptor) {
+ acceptor.accept(keyword$16$Consumer);
acceptor.accept(assignment$17$Consumer);
- acceptor.accept(keyword$19$Consumer);
- acceptor.accept(group$20$Consumer);
- acceptor.accept(keyword$29$Consumer);
+ }
+ }
+
+ protected class Keyword$16$Consumer extends ElementConsumer<Keyword> {
+
+ protected Keyword$16$Consumer(final Keyword keyword) {
+ super(keyword);
+ }
+
+ @Override
+ protected int doConsume(boolean optional) throws Exception {
+ return consumeKeyword(getElement(), null, false, false, getKeyword$16$Delimiter(), optional);
}
}
@@ -223,147 +244,186 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
@Override
protected IElementConsumer getConsumer() {
- return keyword$18$Consumer;
+ return crossReference$18$Consumer;
}
}
- protected class Keyword$18$Consumer extends ElementConsumer<Keyword> {
+ protected class CrossReference$18$Consumer extends ElementConsumer<CrossReference> {
- protected Keyword$18$Consumer(final Keyword keyword) {
+ protected CrossReference$18$Consumer(final CrossReference crossReference) {
+ super(crossReference);
+ }
+
+ @Override
+ protected int doConsume(boolean optional) throws Exception {
+ return consumeNonTerminal(grammarIdConsumer, "usedGrammars", true, true, false, getElement(), optional);
+ }
+ }
+
+ protected class Group$20$Consumer extends OptionalGroupConsumer {
+
+ protected Group$20$Consumer(final Group group) {
+ super(group);
+ }
+
+ @Override
+ protected void doGetConsumers(ConsumerAcceptor acceptor) {
+ acceptor.accept(assignment$23$Consumer);
+ acceptor.accept(keyword$25$Consumer);
+ acceptor.accept(group$26$Consumer);
+ acceptor.accept(keyword$35$Consumer);
+ }
+ }
+
+ protected class Assignment$23$Consumer extends AssignmentConsumer {
+
+ protected Assignment$23$Consumer(final Assignment assignment) {
+ super(assignment);
+ }
+
+ @Override
+ protected IElementConsumer getConsumer() {
+ return keyword$24$Consumer;
+ }
+ }
+
+ protected class Keyword$24$Consumer extends ElementConsumer<Keyword> {
+
+ protected Keyword$24$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), "definesHiddenTokens", false, true, getKeyword$18$Delimiter(), optional);
+ return consumeKeyword(getElement(), "definesHiddenTokens", false, true, getKeyword$24$Delimiter(), optional);
}
}
- protected class Keyword$19$Consumer extends ElementConsumer<Keyword> {
+ protected class Keyword$25$Consumer extends ElementConsumer<Keyword> {
- protected Keyword$19$Consumer(final Keyword keyword) {
+ protected Keyword$25$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), null, false, false, getKeyword$19$Delimiter(), optional);
+ return consumeKeyword(getElement(), null, false, false, getKeyword$25$Delimiter(), optional);
}
}
- protected class Group$20$Consumer extends OptionalGroupConsumer {
+ protected class Group$26$Consumer extends OptionalGroupConsumer {
- protected Group$20$Consumer(final Group group) {
+ protected Group$26$Consumer(final Group group) {
super(group);
}
@Override
protected void doGetConsumers(ConsumerAcceptor acceptor) {
- acceptor.accept(assignment$21$Consumer);
- acceptor.accept(group$24$Consumer);
+ acceptor.accept(assignment$27$Consumer);
+ acceptor.accept(group$30$Consumer);
}
}
- protected class Assignment$21$Consumer extends AssignmentConsumer {
+ protected class Assignment$27$Consumer extends AssignmentConsumer {
- protected Assignment$21$Consumer(final Assignment assignment) {
+ protected Assignment$27$Consumer(final Assignment assignment) {
super(assignment);
}
@Override
protected IElementConsumer getConsumer() {
- return crossReference$22$Consumer;
+ return crossReference$28$Consumer;
}
}
- protected class CrossReference$22$Consumer extends ElementConsumer<CrossReference> {
+ protected class CrossReference$28$Consumer extends ElementConsumer<CrossReference> {
- protected CrossReference$22$Consumer(final CrossReference crossReference) {
+ protected CrossReference$28$Consumer(final CrossReference crossReference) {
super(crossReference);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeTerminal(idConsumer, "hiddenTokens", true, false, getElement(), getCrossReference$22$Delimiter(), optional);
+ return consumeTerminal(idConsumer, "hiddenTokens", true, false, getElement(), getCrossReference$28$Delimiter(), optional);
}
}
- protected class Group$24$Consumer extends LoopGroupConsumer {
+ protected class Group$30$Consumer extends LoopGroupConsumer {
- protected Group$24$Consumer(final Group group) {
+ protected Group$30$Consumer(final Group group) {
super(group);
}
@Override
protected void doGetConsumers(ConsumerAcceptor acceptor) {
- acceptor.accept(keyword$25$Consumer);
- acceptor.accept(assignment$26$Consumer);
+ acceptor.accept(keyword$31$Consumer);
+ acceptor.accept(assignment$32$Consumer);
}
}
- protected class Keyword$25$Consumer extends ElementConsumer<Keyword> {
+ protected class Keyword$31$Consumer extends ElementConsumer<Keyword> {
- protected Keyword$25$Consumer(final Keyword keyword) {
+ protected Keyword$31$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), null, false, false, getKeyword$25$Delimiter(), optional);
+ return consumeKeyword(getElement(), null, false, false, getKeyword$31$Delimiter(), optional);
}
}
- protected class Assignment$26$Consumer extends AssignmentConsumer {
+ protected class Assignment$32$Consumer extends AssignmentConsumer {
- protected Assignment$26$Consumer(final Assignment assignment) {
+ protected Assignment$32$Consumer(final Assignment assignment) {
super(assignment);
}
@Override
protected IElementConsumer getConsumer() {
- return crossReference$27$Consumer;
+ return crossReference$33$Consumer;
}
}
- protected class CrossReference$27$Consumer extends ElementConsumer<CrossReference> {
+ protected class CrossReference$33$Consumer extends ElementConsumer<CrossReference> {
- protected CrossReference$27$Consumer(final CrossReference crossReference) {
+ protected CrossReference$33$Consumer(final CrossReference crossReference) {
super(crossReference);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeTerminal(idConsumer, "hiddenTokens", true, false, getElement(), getCrossReference$27$Delimiter(), optional);
+ return consumeTerminal(idConsumer, "hiddenTokens", true, false, getElement(), getCrossReference$33$Delimiter(), optional);
}
}
- protected class Keyword$29$Consumer extends ElementConsumer<Keyword> {
+ protected class Keyword$35$Consumer extends ElementConsumer<Keyword> {
- protected Keyword$29$Consumer(final Keyword keyword) {
+ protected Keyword$35$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), null, false, false, getKeyword$29$Delimiter(), optional);
+ return consumeKeyword(getElement(), null, false, false, getKeyword$35$Delimiter(), optional);
}
}
- protected class Assignment$30$Consumer extends LoopAssignmentConsumer {
+ protected class Assignment$36$Consumer extends LoopAssignmentConsumer {
- protected Assignment$30$Consumer(final Assignment assignment) {
+ protected Assignment$36$Consumer(final Assignment assignment) {
super(assignment);
}
@Override
protected IElementConsumer getConsumer() {
- return ruleCall$31$Consumer;
+ return ruleCall$37$Consumer;
}
}
- protected class RuleCall$31$Consumer extends ElementConsumer<RuleCall> {
+ protected class RuleCall$37$Consumer extends ElementConsumer<RuleCall> {
- protected RuleCall$31$Consumer(final RuleCall ruleCall) {
+ protected RuleCall$37$Consumer(final RuleCall ruleCall) {
super(ruleCall);
}
@@ -373,21 +433,21 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
}
}
- protected class Assignment$32$Consumer extends MandatoryLoopAssignmentConsumer {
+ protected class Assignment$38$Consumer extends MandatoryLoopAssignmentConsumer {
- protected Assignment$32$Consumer(final Assignment assignment) {
+ protected Assignment$38$Consumer(final Assignment assignment) {
super(assignment);
}
@Override
protected IElementConsumer getConsumer() {
- return ruleCall$33$Consumer;
+ return ruleCall$39$Consumer;
}
}
- protected class RuleCall$33$Consumer extends ElementConsumer<RuleCall> {
+ protected class RuleCall$39$Consumer extends ElementConsumer<RuleCall> {
- protected RuleCall$33$Consumer(final RuleCall ruleCall) {
+ protected RuleCall$39$Consumer(final RuleCall ruleCall) {
super(ruleCall);
}
@@ -399,13 +459,14 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
public XtextGrammarTestLanguageGrammarConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
super(configuration, hiddenTokens);
- crossReference$22$Delimiter = ISequenceMatcher.Factory.nullMatcher();
- crossReference$27$Delimiter = ISequenceMatcher.Factory.nullMatcher();
- keyword$10$Delimiter = ICharacterClass.Factory.nullClass();
- keyword$18$Delimiter = ICharacterClass.Factory.nullClass();
- keyword$19$Delimiter = ICharacterClass.Factory.nullClass();
+ crossReference$28$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ crossReference$33$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$11$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$16$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$24$Delimiter = ICharacterClass.Factory.nullClass();
keyword$25$Delimiter = ICharacterClass.Factory.nullClass();
- keyword$29$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$31$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$35$Delimiter = ICharacterClass.Factory.nullClass();
keyword$6$Delimiter = ICharacterClass.Factory.nullClass();
}
@@ -426,25 +487,29 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele00001AssignmentName());
ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010ParserRuleCallGrammarID());
group$9$Consumer = new Group$9$Consumer(rule.ele0001Group());
- keyword$10$Consumer = new Keyword$10$Consumer(rule.ele00010KeywordExtends());
- assignment$11$Consumer = new Assignment$11$Consumer(rule.ele00011AssignmentSuperGrammar());
- crossReference$12$Consumer = new CrossReference$12$Consumer(rule.ele000110CrossReferenceEStringGrammar());
- group$14$Consumer = new Group$14$Consumer(rule.ele001Group());
- assignment$17$Consumer = new Assignment$17$Consumer(rule.ele001000AssignmentDefinesHiddenTokens());
- keyword$18$Consumer = new Keyword$18$Consumer(rule.ele0010000KeywordHidden());
- keyword$19$Consumer = new Keyword$19$Consumer(rule.ele001001KeywordLeftParenthesis());
- group$20$Consumer = new Group$20$Consumer(rule.ele00101Group());
- assignment$21$Consumer = new Assignment$21$Consumer(rule.ele001010AssignmentHiddenTokens());
- crossReference$22$Consumer = new CrossReference$22$Consumer(rule.ele0010100CrossReferenceEStringAbstractRule());
- group$24$Consumer = new Group$24$Consumer(rule.ele001011Group());
- keyword$25$Consumer = new Keyword$25$Consumer(rule.ele0010110KeywordComma());
- assignment$26$Consumer = new Assignment$26$Consumer(rule.ele0010111AssignmentHiddenTokens());
- crossReference$27$Consumer = new CrossReference$27$Consumer(rule.ele00101110CrossReferenceEStringAbstractRule());
- keyword$29$Consumer = new Keyword$29$Consumer(rule.ele0011KeywordRightParenthesis());
- assignment$30$Consumer = new Assignment$30$Consumer(rule.ele01AssignmentMetamodelDeclarations());
- ruleCall$31$Consumer = new RuleCall$31$Consumer(rule.ele010ParserRuleCallAbstractMetamodelDeclaration());
- assignment$32$Consumer = new Assignment$32$Consumer(rule.ele1AssignmentRules());
- ruleCall$33$Consumer = new RuleCall$33$Consumer(rule.ele10ParserRuleCallAbstractRule());
+ keyword$11$Consumer = new Keyword$11$Consumer(rule.ele000100KeywordWith());
+ assignment$12$Consumer = new Assignment$12$Consumer(rule.ele000101AssignmentUsedGrammars());
+ crossReference$13$Consumer = new CrossReference$13$Consumer(rule.ele0001010CrossReferenceEStringGrammar());
+ group$15$Consumer = new Group$15$Consumer(rule.ele00011Group());
+ keyword$16$Consumer = new Keyword$16$Consumer(rule.ele000110KeywordComma());
+ assignment$17$Consumer = new Assignment$17$Consumer(rule.ele000111AssignmentUsedGrammars());
+ crossReference$18$Consumer = new CrossReference$18$Consumer(rule.ele0001110CrossReferenceEStringGrammar());
+ group$20$Consumer = new Group$20$Consumer(rule.ele001Group());
+ assignment$23$Consumer = new Assignment$23$Consumer(rule.ele001000AssignmentDefinesHiddenTokens());
+ keyword$24$Consumer = new Keyword$24$Consumer(rule.ele0010000KeywordHidden());
+ keyword$25$Consumer = new Keyword$25$Consumer(rule.ele001001KeywordLeftParenthesis());
+ group$26$Consumer = new Group$26$Consumer(rule.ele00101Group());
+ assignment$27$Consumer = new Assignment$27$Consumer(rule.ele001010AssignmentHiddenTokens());
+ crossReference$28$Consumer = new CrossReference$28$Consumer(rule.ele0010100CrossReferenceEStringAbstractRule());
+ group$30$Consumer = new Group$30$Consumer(rule.ele001011Group());
+ keyword$31$Consumer = new Keyword$31$Consumer(rule.ele0010110KeywordComma());
+ assignment$32$Consumer = new Assignment$32$Consumer(rule.ele0010111AssignmentHiddenTokens());
+ crossReference$33$Consumer = new CrossReference$33$Consumer(rule.ele00101110CrossReferenceEStringAbstractRule());
+ keyword$35$Consumer = new Keyword$35$Consumer(rule.ele0011KeywordRightParenthesis());
+ assignment$36$Consumer = new Assignment$36$Consumer(rule.ele01AssignmentMetamodelDeclarations());
+ ruleCall$37$Consumer = new RuleCall$37$Consumer(rule.ele010ParserRuleCallAbstractMetamodelDeclaration());
+ assignment$38$Consumer = new Assignment$38$Consumer(rule.ele1AssignmentRules());
+ ruleCall$39$Consumer = new RuleCall$39$Consumer(rule.ele10ParserRuleCallAbstractRule());
}
@Override
@@ -473,44 +538,44 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
this.idConsumer = idConsumer;
}
- public ISequenceMatcher getCrossReference$22$Delimiter() {
- return crossReference$22$Delimiter;
+ public ISequenceMatcher getCrossReference$28$Delimiter() {
+ return crossReference$28$Delimiter;
}
- public void setCrossReference$22$Delimiter(ISequenceMatcher matcher) {
- crossReference$22$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ public void setCrossReference$28$Delimiter(ISequenceMatcher matcher) {
+ crossReference$28$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
}
- public ISequenceMatcher getCrossReference$27$Delimiter() {
- return crossReference$27$Delimiter;
+ public ISequenceMatcher getCrossReference$33$Delimiter() {
+ return crossReference$33$Delimiter;
}
- public void setCrossReference$27$Delimiter(ISequenceMatcher matcher) {
- crossReference$27$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ public void setCrossReference$33$Delimiter(ISequenceMatcher matcher) {
+ crossReference$33$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
}
- public ICharacterClass getKeyword$10$Delimiter() {
- return keyword$10$Delimiter;
+ public ICharacterClass getKeyword$11$Delimiter() {
+ return keyword$11$Delimiter;
}
- public void setKeyword$10$Delimiter(ICharacterClass characterClass) {
- keyword$10$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ public void setKeyword$11$Delimiter(ICharacterClass characterClass) {
+ keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
- public ICharacterClass getKeyword$18$Delimiter() {
- return keyword$18$Delimiter;
+ public ICharacterClass getKeyword$16$Delimiter() {
+ return keyword$16$Delimiter;
}
- public void setKeyword$18$Delimiter(ICharacterClass characterClass) {
- keyword$18$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ public void setKeyword$16$Delimiter(ICharacterClass characterClass) {
+ keyword$16$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
- public ICharacterClass getKeyword$19$Delimiter() {
- return keyword$19$Delimiter;
+ public ICharacterClass getKeyword$24$Delimiter() {
+ return keyword$24$Delimiter;
}
- public void setKeyword$19$Delimiter(ICharacterClass characterClass) {
- keyword$19$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ public void setKeyword$24$Delimiter(ICharacterClass characterClass) {
+ keyword$24$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
public ICharacterClass getKeyword$25$Delimiter() {
@@ -521,12 +586,20 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
keyword$25$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
- public ICharacterClass getKeyword$29$Delimiter() {
- return keyword$29$Delimiter;
+ public ICharacterClass getKeyword$31$Delimiter() {
+ return keyword$31$Delimiter;
+ }
+
+ public void setKeyword$31$Delimiter(ICharacterClass characterClass) {
+ keyword$31$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$35$Delimiter() {
+ return keyword$35$Delimiter;
}
- public void setKeyword$29$Delimiter(ICharacterClass characterClass) {
- keyword$29$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ public void setKeyword$35$Delimiter(ICharacterClass characterClass) {
+ keyword$35$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
public ICharacterClass getKeyword$6$Delimiter() {
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 09736c9..9cd8ba4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.