aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-01 13:58:21 (EST)
committersefftinge2009-03-01 13:58:21 (EST)
commit9e4b2128f96d45bcf6c74e0fc6e5c4fa290f0e40 (patch)
tree8d776e2df03f5a6e8ad132a166048036565edf7d
parent029e9b3980ab0ab25a7b1ccf31a7154409b09b57 (diff)
downloadorg.eclipse.xtext-9e4b2128f96d45bcf6c74e0fc6e5c4fa290f0e40.zip
org.eclipse.xtext-9e4b2128f96d45bcf6c74e0fc6e5c4fa290f0e40.tar.gz
org.eclipse.xtext-9e4b2128f96d45bcf6c74e0fc6e5c4fa290f0e40.tar.bz2
Renamed XtextBuiltIn to org.eclipse.xtext.common.Terminals (see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=264989)
-rw-r--r--devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java2
-rw-r--r--devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java21
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi169
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammarStandaloneSetup.java3
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java87
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g91
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java157
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java534
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g41
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java72
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java4
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java8
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java4
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java4
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java76
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java14
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi169
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/DomainmodelStandaloneSetup.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java63
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g84
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java79
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java694
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g41
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java72
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java72
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java7
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi169
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDslStandaloneSetup.java3
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java175
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g160
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java191
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java2288
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g37
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java72
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java6
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java6
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java136
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/AbstractFowlerDslUiModule.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposals.java21
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi169
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDslStandaloneSetup.java3
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/FowlerDslParsetreeConstructor.java47
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g68
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java79
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java202
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g41
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java72
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java56
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/CommonTokenStyles.java (renamed from plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/BuiltinTokenStyles.java)2
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/DefaultTokenScanner.java2
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/NullTokenStyleProvider.java2
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/antlr/CommonAntlrTokenColorer.java (renamed from plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/antlr/BuiltinAntlrTokenColorer.java)16
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/syntaxcoloring/antlr/NullTokenColorer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parseTreeConstruction/ImportUriTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parseTreeConstruction/LangATestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageParser.java64
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageParser.java64
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parseTreeConstruction/DummyTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageParser.java20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parseTreeConstruction/LowerCaseNamedTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/consumers/LowerCaseNamedTestLanguageModelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/packrat/lowerCaseNamedTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi226
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi226
-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.xmi169
-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/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/BaseInheritanceTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/ConcreteTestLanguageParsetreeConstructor.java96
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/InheritanceTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g108
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java95
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java490
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g45
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguageParser.java60
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java70
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/BaseInheritanceTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java42
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/InheritanceTestLanguageParserConfiguration.java42
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageExtendableParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java121
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageREALConsumer.java58
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/BaseInheritanceTestLanguageModelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRule2Consumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageOverridableParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule1Consumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule2Consumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageSubrule3Consumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageElementConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/InheritanceTestLanguageModelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java218
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parseTreeConstruction/MetamodelRefTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parseTreeConstruction/MultiGenMMTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageParser.java42
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguageParser.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g99
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java131
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1522
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parseTreeConstruction/DatatypeRulesTestLanguageParsetreeConstructor.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguage.g57
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguageParser.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java60
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parseTreeConstruction/EpatchTestLanguageParsetreeConstructor.java255
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g204
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageLexer.java687
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java2034
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage__.g43
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java160
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parseTreeConstruction/KeywordsTestLanguageParsetreeConstructor.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarIDConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguageStandaloneSetup.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parseTreeConstruction/FormatterTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java122
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/ComplexReconstrTestLanguageParsetreeConstructor.java199
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parseTreeConstruction/SimpleReconstrTestLanguageParsetreeConstructor.java95
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g62
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java230
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage.g99
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java414
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageAtomConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyA1Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG2Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageAtomConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java132
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java80
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTestStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parseTreeConstruction/TransientValuesTestParsetreeConstructor.java47
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTest.g68
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTestLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTestParser.java114
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTest__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/TransientValuesTestParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java56
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parseTreeConstruction/MultiValueFeatureTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/MultiValueFeatureTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/packrat/consumers/MultiValueFeatureTestLanguageStartConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/services/MultiValueFeatureTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java84
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ActionTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ContentAssistTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/FowlerDslTestLanguageParsetreeConstructor.java47
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LexerTestLanguageParsetreeConstructor.java14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LookaheadTestLanguageParsetreeConstructor.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/OptionalEmptyTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/PartialParserTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/SimpleExpressionsTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TreeTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java120
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguage.g68
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguageParser.java202
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguageLexer.java344
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguageParser.java14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguage__.g36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguageLexer.java139
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguageParser.java530
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g86
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java117
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java476
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java46
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java88
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageParser.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ActionTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/FowlerDslTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/LexerTestLanguageParserConfiguration.java64
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/LookaheadTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/OptionalEmptyTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/PartialParserTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/PartialParserTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/SimpleExpressionsTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNamedConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSomeContainerConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAtomConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageTerminalRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java56
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi169
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313StandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parseTreeConstruction/Bug250313ParsetreeConstructor.java71
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java79
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java342
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313__.g41
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/Bug250313ParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Child1Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Child2Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313DatatypeConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313ModelConsumer.java20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313NestedDatatypeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java80
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java52
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageREALConsumer.java34
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParserTest.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/CommentTest.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/ParseTreeUtilTest.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/valueconverter/Bug250313RuntimeModule.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.java14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext20
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java3
-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.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/GenAbstractTestLanguageProposals.java20
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalAbstractTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalAbstractTestLanguage.tokens12
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalAbstractTestLanguageLexer.java493
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalAbstractTestLanguageParser.java14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalAbstractTestLanguage__.g45
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java64
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageOverridableParserRule2Consumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java87
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g99
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java131
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1522
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposals.java21
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parseTreeConstruction/KeywordsTestLanguageParsetreeConstructor.java7
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarIDConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java84
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.java21
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.java21
-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/GenTreeTestLanguageProposals.java21
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ContentAssistTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java79
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TreeTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java120
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g86
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java117
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java476
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageParser.java40
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposals.java21
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parseTreeConstruction/TwoContextsTestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageParser.java26
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/TwoContextsTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/packrat/consumers/TwoContextsTestLanguageAnElementConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposals.java21
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parseTreeConstruction/TestLanguageParsetreeConstructor.java15
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguage.g48
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguageLexer.java79
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguageParser.java6
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/TestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/packrat/consumers/TestLanguageStuffConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext34
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parseTreeConstruction/XtextGrammarTestLanguageParsetreeConstructor.java87
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g99
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java131
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1522
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposals.ext6
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parseTreeConstruction/KeywordsTestLanguageParsetreeConstructor.java7
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/packrat/KeywordsTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java36
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarIDConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java84
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.ext6
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.ext6
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext12
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposals.ext6
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi169
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageStandaloneSetup.java3
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ContentAssistTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java79
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/TreeTestLanguageParsetreeConstructor.java23
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g53
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java120
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g86
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java117
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java476
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g55
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java87
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageParser.java40
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g41
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ContentAssistTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageDelimiters.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/ReferenceGrammarTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/TreeTestLanguageParserConfiguration.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java44
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java72
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java44
665 files changed, 27436 insertions, 16751 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
index 0e32bcf..2612799 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
@@ -17,7 +17,7 @@ public abstract class AbstractReferenceGrammarUiModule extends DefaultUIModule {
}
public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
- return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.BuiltinAntlrTokenColorer.class;
+ return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
}
public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java
index 1a37105..28b4af1 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java
@@ -224,6 +224,27 @@ public class GenReferenceGrammarProposals extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
+
+ public List<? extends ICompletionProposal> completeEcore_EString(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("completeEcore_EString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+ + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
+ }
+ return Collections.emptyList();
+ }
+
+ public List<? extends ICompletionProposal> completeEcore_EInt(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("completeEcore_EInt '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+ + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
+ }
+ return Collections.emptyList();
+ }
+
+
+
+
+
@Override
protected String getDefaultImageFilePath() {
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 51e8934..ab2cc13 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
@@ -220,44 +220,197 @@
</alternatives>
</rules>
</xtext:Grammar>
- <xtext:Grammar name="org.eclipse.xtext.builtin.XtextBuiltin" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
+ <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
<ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
</metamodelDeclarations>
- <rules xsi:type="xtext:LexerRule" name="ID" body="('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*">
+ <rules xsi:type="xtext:ParserRule" name="ID" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="0"/>
+ <right value="9"/>
+ </groups>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="INT" body="('0'..'9')+">
+ <rules xsi:type="xtext:ParserRule" name="INT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</type>
+ <alternatives xsi:type="xtext:CharacterRange" cardinality="+">
+ <left value="0"/>
+ <right value="9"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="STRING" body="&#xA;&#x9;&#x9;&#x9; '&quot;' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'&quot;') )* '&quot;' | &#xA; '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'\'') )* '\''&#xA; ">
+ <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ML_COMMENT" body="'/*' ( options {greedy=false;} : . )* '*/'">
+ <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="/*"/>
+ <abstractTokens xsi:type="xtext:UpToToken">
+ <terminal xsi:type="xtext:Keyword" value="*/"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="SL_COMMENT" body="'//' ~('\n'|'\r')* ('\r'? '\n')?">
+ <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="//"/>
+ <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </terminal>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Group" cardinality="?">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="&#xA;"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="WS" body="(' '|'\t'|'\r'|'\n')+">
+ <rules xsi:type="xtext:ParserRule" name="WS" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives" cardinality="+">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value=" "/>
+ <groups xsi:type="xtext:Keyword" value="&#x9;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ANY_OTHER" body=".">
+ <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Wildcard" isWildcard="true"/>
</rules>
</xtext:Grammar>
</xmi:XMI>
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 70e0926..961a717 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
@@ -1,4 +1,3 @@
-
package org.eclipse.xtext.reference;
import org.eclipse.emf.ecore.EPackage;
@@ -21,7 +20,7 @@ public class ReferenceGrammarStandaloneSetup implements ISetup {
public Injector createInjectorAndDoEMFRegistration() {
- org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup.doSetup();
+ org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
register(injector);
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
index 27b2f15..ad109f9 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
@@ -219,11 +219,13 @@ protected class Spielplatz_0_0_0_0_1_Assignment_groesse extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("groesse",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("groesse");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prSpielplatz().ele000010LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prSpielplatz().ele000010ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -245,11 +247,13 @@ protected class Spielplatz_0_0_0_1_Assignment_beschreibung extends AssignmentTok
protected Solution createSolution() {
if((value = current.getConsumable("beschreibung",!IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("beschreibung");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -788,11 +792,13 @@ protected class Kind_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prKind().ele0010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prKind().ele0010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -814,11 +820,13 @@ protected class Kind_0_1_Assignment_age extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("age",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("age");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prKind().ele010LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prKind().ele010ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -1008,11 +1016,13 @@ protected class Erwachsener_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prErwachsener().ele0010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prErwachsener().ele0010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1034,11 +1044,13 @@ protected class Erwachsener_0_1_Assignment_age extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("age",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("age");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prErwachsener().ele010LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prErwachsener().ele010ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -1228,11 +1240,13 @@ protected class Spielzeug_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prSpielzeug().ele0010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prSpielzeug().ele0010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1553,16 +1567,20 @@ protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
return new Solution(obj);
}
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING();
return new Solution(obj);
}
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prFamilie().ele00000101LexerRuleCallID();
+
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prFamilie().ele00000101ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1866,11 +1884,13 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1878,4 +1898,11 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken
/************ end Rule CustomTypeParserRule ****************/
+
+
+
+
+
+
+
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
index b99242f..00899f4 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
@@ -87,9 +87,8 @@ ruleSpielplatz returns [EObject current=null]
}
(
- lv_groesse_1= RULE_INT
- {
- createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse");
+ lv_groesse_1=RULE_INT {
+ createLeafNode(grammarAccess.prSpielplatz().ele000010ParserRuleCallINT(), "groesse");
}
{
@@ -107,9 +106,8 @@ ruleSpielplatz returns [EObject current=null]
))(
- lv_beschreibung_2= RULE_STRING
- {
- createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung");
+ lv_beschreibung_2=RULE_STRING {
+ createLeafNode(grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING(), "beschreibung");
}
{
@@ -277,9 +275,8 @@ ruleKind returns [EObject current=null]
}
)(
- lv_name_2= RULE_ID
- {
- createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name");
+ lv_name_2=RULE_ID {
+ createLeafNode(grammarAccess.prKind().ele0010ParserRuleCallID(), "name");
}
{
@@ -297,9 +294,8 @@ ruleKind returns [EObject current=null]
))(
- lv_age_3= RULE_INT
- {
- createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age");
+ lv_age_3=RULE_INT {
+ createLeafNode(grammarAccess.prKind().ele010ParserRuleCallINT(), "age");
}
{
@@ -352,9 +348,8 @@ ruleErwachsener returns [EObject current=null]
}
)(
- lv_name_2= RULE_ID
- {
- createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name");
+ lv_name_2=RULE_ID {
+ createLeafNode(grammarAccess.prErwachsener().ele0010ParserRuleCallID(), "name");
}
{
@@ -372,9 +367,8 @@ ruleErwachsener returns [EObject current=null]
))(
- lv_age_3= RULE_INT
- {
- createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age");
+ lv_age_3=RULE_INT {
+ createLeafNode(grammarAccess.prErwachsener().ele010ParserRuleCallINT(), "age");
}
{
@@ -427,9 +421,8 @@ ruleSpielzeug returns [EObject current=null]
}
)(
- lv_name_2= RULE_ID
- {
- createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name");
+ lv_name_2=RULE_ID {
+ createLeafNode(grammarAccess.prSpielzeug().ele0010ParserRuleCallID(), "name");
}
{
@@ -511,13 +504,13 @@ ruleFamilie returns [EObject current=null]
| RULE_STRING
{
- createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name");
+ createLeafNode(grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING(), "name");
}
)
| RULE_ID
{
- createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prFamilie().ele00000101ParserRuleCallID(), "name");
}
)
@@ -700,9 +693,8 @@ ruleCustomTypeParserRule returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID(), "name");
}
{
@@ -742,21 +734,52 @@ ruleCustomTypeParserRule returns [EObject current=null]
-RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*;
+
+
RULE_INT : ('0'..'9')+;
-RULE_STRING :
- '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |
- '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''
- ;
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/';
-RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?;
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+
+
+
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+
+
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+
+
+
+RULE_WS : (((' '|'\t')|'\r')|'\n')+;
+
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
RULE_ANY_OTHER : .;
+
+
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
index 2b55166..4273281 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
@@ -345,10 +345,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:757:9: ( ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:757:11: ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:11: ( '^' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:757:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -357,7 +357,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:12: '^'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:757:11: '^'
{
match('^');
@@ -376,7 +376,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:757:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -424,10 +424,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -441,7 +441,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:13: '0' .. '9'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:13: '0' .. '9'
{
matchRange('0','9');
@@ -471,7 +471,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:749:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ {
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -483,16 +486,16 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("749:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input);
+ new NoViableAltException("765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -508,7 +511,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:12: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765: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' ) {
@@ -525,7 +528,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:56: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:76: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -551,10 +554,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -570,7 +573,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765: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' ) {
@@ -587,7 +590,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:66: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:158: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -614,6 +617,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
break;
}
+
+
+ }
+
this.type = _type;
}
finally {
@@ -625,12 +632,12 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -655,7 +662,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:52: .
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:52: .
{
matchAny();
@@ -683,12 +690,12 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -701,7 +708,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773: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();
@@ -722,7 +729,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -731,9 +738,9 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: ( '\\r' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -742,7 +749,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: '\\r'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:41: '\\r'
{
match('\r');
@@ -772,10 +779,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:777:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:777:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:777:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -828,8 +835,8 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:760:16: ( . )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:760:18: .
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:781:16: ( . )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:781:18: .
{
matchAny();
@@ -861,24 +868,30 @@ public class InternalReferenceGrammarLexer extends Lexer {
if ( (LA12_53=='l') ) {
switch ( input.LA(6) ) {
- case 'z':
+ case 'p':
{
int LA12_70 = input.LA(7);
- if ( (LA12_70=='e') ) {
+ if ( (LA12_70=='l') ) {
int LA12_75 = input.LA(8);
- if ( (LA12_75=='u') ) {
+ if ( (LA12_75=='a') ) {
int LA12_80 = input.LA(9);
- if ( (LA12_80=='g') ) {
+ if ( (LA12_80=='t') ) {
int LA12_85 = input.LA(10);
- if ( ((LA12_85>='0' && LA12_85<='9')||(LA12_85>='A' && LA12_85<='Z')||LA12_85=='_'||(LA12_85>='a' && LA12_85<='z')) ) {
- alt12=17;
+ if ( (LA12_85=='z') ) {
+ int LA12_88 = input.LA(11);
+
+ if ( ((LA12_88>='0' && LA12_88<='9')||(LA12_88>='A' && LA12_88<='Z')||LA12_88=='_'||(LA12_88>='a' && LA12_88<='z')) ) {
+ alt12=17;
+ }
+ else {
+ alt12=1;}
}
else {
- alt12=8;}
+ alt12=17;}
}
else {
alt12=17;}
@@ -890,30 +903,24 @@ public class InternalReferenceGrammarLexer extends Lexer {
alt12=17;}
}
break;
- case 'p':
+ case 'z':
{
int LA12_71 = input.LA(7);
- if ( (LA12_71=='l') ) {
+ if ( (LA12_71=='e') ) {
int LA12_76 = input.LA(8);
- if ( (LA12_76=='a') ) {
+ if ( (LA12_76=='u') ) {
int LA12_81 = input.LA(9);
- if ( (LA12_81=='t') ) {
+ if ( (LA12_81=='g') ) {
int LA12_86 = input.LA(10);
- if ( (LA12_86=='z') ) {
- int LA12_89 = input.LA(11);
-
- if ( ((LA12_89>='0' && LA12_89<='9')||(LA12_89>='A' && LA12_89<='Z')||LA12_89=='_'||(LA12_89>='a' && LA12_89<='z')) ) {
- alt12=17;
- }
- else {
- alt12=1;}
+ if ( ((LA12_86>='0' && LA12_86<='9')||(LA12_86>='A' && LA12_86<='Z')||LA12_86=='_'||(LA12_86>='a' && LA12_86<='z')) ) {
+ alt12=17;
}
else {
- alt12=17;}
+ alt12=8;}
}
else {
alt12=17;}
@@ -1190,25 +1197,14 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
else if ( (LA12_0=='G') ) {
switch ( input.LA(2) ) {
- case 'R':
- {
- int LA12_35 = input.LA(3);
-
- if ( (LA12_35=='\u00DC') ) {
- alt12=15;
- }
- else {
- alt12=17;}
- }
- break;
case 'E':
{
- int LA12_36 = input.LA(3);
+ int LA12_35 = input.LA(3);
- if ( (LA12_36=='L') ) {
- int LA12_51 = input.LA(4);
+ if ( (LA12_35=='L') ) {
+ int LA12_50 = input.LA(4);
- if ( (LA12_51=='B') ) {
+ if ( (LA12_50=='B') ) {
int LA12_60 = input.LA(5);
if ( ((LA12_60>='0' && LA12_60<='9')||(LA12_60>='A' && LA12_60<='Z')||LA12_60=='_'||(LA12_60>='a' && LA12_60<='z')) ) {
@@ -1224,6 +1220,17 @@ public class InternalReferenceGrammarLexer extends Lexer {
alt12=17;}
}
break;
+ case 'R':
+ {
+ int LA12_36 = input.LA(3);
+
+ if ( (LA12_36=='\u00DC') ) {
+ alt12=15;
+ }
+ else {
+ alt12=17;}
+ }
+ break;
default:
alt12=17;}
@@ -1290,14 +1297,14 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
else if ( (LA12_0=='/') ) {
switch ( input.LA(2) ) {
- case '/':
+ case '*':
{
- alt12=21;
+ alt12=20;
}
break;
- case '*':
+ case '/':
{
- alt12=20;
+ alt12=21;
}
break;
default:
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
index af60110..ef2bb8b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
@@ -154,9 +154,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:90:6: lv_groesse_1= RULE_INT
{
lv_groesse_1=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz142);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz141);
- createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse");
+ createLeafNode(grammarAccess.prSpielplatz().ele000010ParserRuleCallINT(), "groesse");
if (current==null) {
@@ -176,7 +176,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:108:3: (lv_beschreibung_2= RULE_STRING )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:107:3: (lv_beschreibung_2= RULE_STRING )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -185,12 +185,12 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:110:6: lv_beschreibung_2= RULE_STRING
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:109:6: lv_beschreibung_2= RULE_STRING
{
lv_beschreibung_2=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz173);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz170);
- createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung");
+ createLeafNode(grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING(), "beschreibung");
if (current==null) {
@@ -213,14 +213,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,12,FOLLOW_12_in_ruleSpielplatz192);
+ match(input,12,FOLLOW_12_in_ruleSpielplatz188);
createLeafNode(grammarAccess.prSpielplatz().ele001KeywordLeftCurlyBracket(), null);
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:2: ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:2: ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )*
loop5:
do {
int alt5=3;
@@ -236,9 +236,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )
int alt4=2;
int LA4_0 = input.LA(1);
@@ -250,15 +250,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )", 4, 0, input);
+ new NoViableAltException("130:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )", 4, 0, input);
throw nvae;
}
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )
int alt3=2;
int LA3_0 = input.LA(1);
@@ -270,15 +270,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )", 3, 0, input);
+ new NoViableAltException("130:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )", 3, 0, input);
throw nvae;
}
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -290,21 +290,21 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )", 2, 0, input);
+ new NoViableAltException("130:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:6: (lv_kinder_4= ruleKind )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:6: (lv_kinder_4= ruleKind )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:6: (lv_kinder_4= ruleKind )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:135:6: lv_kinder_4= ruleKind
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:6: (lv_kinder_4= ruleKind )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:133:6: lv_kinder_4= ruleKind
{
currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100000ParserRuleCallKind(), currentNode);
- pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz231);
+ pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz227);
lv_kinder_4=ruleKind();
_fsp--;
@@ -328,15 +328,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:154:6: (lv_erzieher_5= ruleErwachsener )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:152:6: (lv_erzieher_5= ruleErwachsener )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:154:6: (lv_erzieher_5= ruleErwachsener )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:157:6: lv_erzieher_5= ruleErwachsener
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:152:6: (lv_erzieher_5= ruleErwachsener )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:155:6: lv_erzieher_5= ruleErwachsener
{
currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100010ParserRuleCallErwachsener(), currentNode);
- pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz275);
+ pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz271);
lv_erzieher_5=ruleErwachsener();
_fsp--;
@@ -366,15 +366,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:176:6: (lv_spielzeuge_6= ruleSpielzeug )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:174:6: (lv_spielzeuge_6= ruleSpielzeug )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:176:6: (lv_spielzeuge_6= ruleSpielzeug )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:179:6: lv_spielzeuge_6= ruleSpielzeug
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:174:6: (lv_spielzeuge_6= ruleSpielzeug )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:177:6: lv_spielzeuge_6= ruleSpielzeug
{
currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele010010ParserRuleCallSpielzeug(), currentNode);
- pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz320);
+ pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz316);
lv_spielzeuge_6=ruleSpielzeug();
_fsp--;
@@ -404,15 +404,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:198:6: (lv_familie_7= ruleFamilie )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:196:6: (lv_familie_7= ruleFamilie )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:198:6: (lv_familie_7= ruleFamilie )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:201:6: lv_familie_7= ruleFamilie
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:196:6: (lv_familie_7= ruleFamilie )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:199:6: lv_familie_7= ruleFamilie
{
currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele01010ParserRuleCallFamilie(), currentNode);
- pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz365);
+ pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz361);
lv_familie_7=ruleFamilie();
_fsp--;
@@ -442,15 +442,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:220:6: (lv_types_8= ruleCustomTypeParserRule )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:218:6: (lv_types_8= ruleCustomTypeParserRule )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:220:6: (lv_types_8= ruleCustomTypeParserRule )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:223:6: lv_types_8= ruleCustomTypeParserRule
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:218:6: (lv_types_8= ruleCustomTypeParserRule )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:221:6: lv_types_8= ruleCustomTypeParserRule
{
currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0110ParserRuleCallCustomTypeParserRule(), currentNode);
- pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz410);
+ pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz406);
lv_types_8=ruleCustomTypeParserRule();
_fsp--;
@@ -482,7 +482,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,13,FOLLOW_13_in_ruleSpielplatz426);
+ match(input,13,FOLLOW_13_in_ruleSpielplatz422);
createLeafNode(grammarAccess.prSpielplatz().ele1KeywordRightCurlyBracket(), null);
@@ -512,7 +512,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleKind
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:256:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:254:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ;
public final EObject entryRuleKind() throws RecognitionException {
EObject current = null;
@@ -520,16 +520,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:256:46: (iv_ruleKind= ruleKind EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:257:2: iv_ruleKind= ruleKind EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:254:46: (iv_ruleKind= ruleKind EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:255:2: iv_ruleKind= ruleKind EOF
{
currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode);
- pushFollow(FOLLOW_ruleKind_in_entryRuleKind464);
+ pushFollow(FOLLOW_ruleKind_in_entryRuleKind460);
iv_ruleKind=ruleKind();
_fsp--;
current =iv_ruleKind;
- match(input,EOF,FOLLOW_EOF_in_entryRuleKind474);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleKind470);
}
@@ -547,7 +547,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleKind
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:264:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:262:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ;
public final EObject ruleKind() throws RecognitionException {
EObject current = null;
@@ -557,39 +557,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:269:6: ( ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267:6: ( ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:4: ( 'kind' '(' ) (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:4: ( 'kind' '(' ) (lv_name_2= RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:4: ( 'kind' '(' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:5: 'kind' '('
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:4: ( 'kind' '(' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:5: 'kind' '('
{
- match(input,14,FOLLOW_14_in_ruleKind511);
+ match(input,14,FOLLOW_14_in_ruleKind507);
createLeafNode(grammarAccess.prKind().ele0000KeywordKind(), null);
- match(input,15,FOLLOW_15_in_ruleKind520);
+ match(input,15,FOLLOW_15_in_ruleKind516);
createLeafNode(grammarAccess.prKind().ele0001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:278:2: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:280:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:276:2: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:278:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind543);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind538);
- createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prKind().ele0010ParserRuleCallID(), "name");
if (current==null) {
@@ -609,13 +609,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:298:3: (lv_age_3= RULE_INT )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:300:6: lv_age_3= RULE_INT
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:295:3: (lv_age_3= RULE_INT )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:297:6: lv_age_3= RULE_INT
{
lv_age_3=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind574);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind567);
- createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age");
+ createLeafNode(grammarAccess.prKind().ele010ParserRuleCallINT(), "age");
if (current==null) {
@@ -635,7 +635,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,16,FOLLOW_16_in_ruleKind592);
+ match(input,16,FOLLOW_16_in_ruleKind584);
createLeafNode(grammarAccess.prKind().ele1KeywordRightParenthesis(), null);
@@ -662,7 +662,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleErwachsener
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:331:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ;
public final EObject entryRuleErwachsener() throws RecognitionException {
EObject current = null;
@@ -670,16 +670,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:331:53: (iv_ruleErwachsener= ruleErwachsener EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:332:2: iv_ruleErwachsener= ruleErwachsener EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:53: (iv_ruleErwachsener= ruleErwachsener EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:2: iv_ruleErwachsener= ruleErwachsener EOF
{
currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode);
- pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener627);
+ pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener619);
iv_ruleErwachsener=ruleErwachsener();
_fsp--;
current =iv_ruleErwachsener;
- match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener637);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener629);
}
@@ -697,7 +697,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleErwachsener
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:339:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:335:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ;
public final EObject ruleErwachsener() throws RecognitionException {
EObject current = null;
@@ -707,39 +707,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:344:6: ( ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340:6: ( ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:4: ( 'erwachsener' '(' ) (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:4: ( 'erwachsener' '(' ) (lv_name_2= RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:4: ( 'erwachsener' '(' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:5: 'erwachsener' '('
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:4: ( 'erwachsener' '(' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:5: 'erwachsener' '('
{
- match(input,17,FOLLOW_17_in_ruleErwachsener674);
+ match(input,17,FOLLOW_17_in_ruleErwachsener666);
createLeafNode(grammarAccess.prErwachsener().ele0000KeywordErwachsener(), null);
- match(input,15,FOLLOW_15_in_ruleErwachsener683);
+ match(input,15,FOLLOW_15_in_ruleErwachsener675);
createLeafNode(grammarAccess.prErwachsener().ele0001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:353:2: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:355:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:349:2: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:351:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener706);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener697);
- createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prErwachsener().ele0010ParserRuleCallID(), "name");
if (current==null) {
@@ -759,13 +759,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:373:3: (lv_age_3= RULE_INT )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:375:6: lv_age_3= RULE_INT
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:368:3: (lv_age_3= RULE_INT )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:370:6: lv_age_3= RULE_INT
{
lv_age_3=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener737);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener726);
- createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age");
+ createLeafNode(grammarAccess.prErwachsener().ele010ParserRuleCallINT(), "age");
if (current==null) {
@@ -785,7 +785,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,16,FOLLOW_16_in_ruleErwachsener755);
+ match(input,16,FOLLOW_16_in_ruleErwachsener743);
createLeafNode(grammarAccess.prErwachsener().ele1KeywordRightParenthesis(), null);
@@ -812,7 +812,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleSpielzeug
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:406:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:400:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ;
public final EObject entryRuleSpielzeug() throws RecognitionException {
EObject current = null;
@@ -820,16 +820,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:406:51: (iv_ruleSpielzeug= ruleSpielzeug EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:407:2: iv_ruleSpielzeug= ruleSpielzeug EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:400:51: (iv_ruleSpielzeug= ruleSpielzeug EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:401:2: iv_ruleSpielzeug= ruleSpielzeug EOF
{
currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode);
- pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug790);
+ pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug778);
iv_ruleSpielzeug=ruleSpielzeug();
_fsp--;
current =iv_ruleSpielzeug;
- match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug800);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug788);
}
@@ -847,7 +847,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleSpielzeug
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:408:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) ;
public final EObject ruleSpielzeug() throws RecognitionException {
EObject current = null;
@@ -858,39 +858,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:419:6: ( ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:6: ( ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:4: ( 'spielzeug' '(' ) (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:4: ( 'spielzeug' '(' ) (lv_name_2= RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:4: ( 'spielzeug' '(' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:5: 'spielzeug' '('
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:4: ( 'spielzeug' '(' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:5: 'spielzeug' '('
{
- match(input,18,FOLLOW_18_in_ruleSpielzeug837);
+ match(input,18,FOLLOW_18_in_ruleSpielzeug825);
createLeafNode(grammarAccess.prSpielzeug().ele0000KeywordSpielzeug(), null);
- match(input,15,FOLLOW_15_in_ruleSpielzeug846);
+ match(input,15,FOLLOW_15_in_ruleSpielzeug834);
createLeafNode(grammarAccess.prSpielzeug().ele0001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:428:2: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:430:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:422:2: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:424:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug869);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug856);
- createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prSpielzeug().ele0010ParserRuleCallID(), "name");
if (current==null) {
@@ -910,13 +910,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:448:3: (lv_farbe_3= ruleFarbe )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:451:6: lv_farbe_3= ruleFarbe
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:441:3: (lv_farbe_3= ruleFarbe )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:444:6: lv_farbe_3= ruleFarbe
{
currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele010ParserRuleCallFarbe(), currentNode);
- pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug912);
+ pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug898);
lv_farbe_3=ruleFarbe();
_fsp--;
@@ -939,7 +939,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,16,FOLLOW_16_in_ruleSpielzeug926);
+ match(input,16,FOLLOW_16_in_ruleSpielzeug912);
createLeafNode(grammarAccess.prSpielzeug().ele1KeywordRightParenthesis(), null);
@@ -966,7 +966,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleFamilie
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:482:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:475:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ;
public final EObject entryRuleFamilie() throws RecognitionException {
EObject current = null;
@@ -974,16 +974,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:482:49: (iv_ruleFamilie= ruleFamilie EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:483:2: iv_ruleFamilie= ruleFamilie EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:475:49: (iv_ruleFamilie= ruleFamilie EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:476:2: iv_ruleFamilie= ruleFamilie EOF
{
currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode);
- pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie961);
+ pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie947);
iv_ruleFamilie=ruleFamilie();
_fsp--;
current =iv_ruleFamilie;
- match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie971);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie957);
}
@@ -1001,7 +1001,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleFamilie
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:490:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:483:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) ;
public final EObject ruleFamilie() throws RecognitionException {
EObject current = null;
@@ -1010,45 +1010,45 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:495:6: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:6: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )*
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:7: ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:7: ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:7: ( 'familie' '(' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:8: 'familie' '('
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:7: ( 'familie' '(' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:8: 'familie' '('
{
- match(input,19,FOLLOW_19_in_ruleFamilie1011);
+ match(input,19,FOLLOW_19_in_ruleFamilie997);
createLeafNode(grammarAccess.prFamilie().ele0000000KeywordFamilie(), null);
- match(input,15,FOLLOW_15_in_ruleFamilie1020);
+ match(input,15,FOLLOW_15_in_ruleFamilie1006);
createLeafNode(grammarAccess.prFamilie().ele0000001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:504:2: (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:6: lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:2: (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:6: lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -1060,15 +1060,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("506:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input);
+ new NoViableAltException("499:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input);
throw nvae;
}
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:17: ( 'keyword' | RULE_STRING )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:17: ( 'keyword' | RULE_STRING )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:17: ( 'keyword' | RULE_STRING )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:17: ( 'keyword' | RULE_STRING )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -1080,15 +1080,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("506:17: ( 'keyword' | RULE_STRING )", 7, 0, input);
+ new NoViableAltException("499:17: ( 'keyword' | RULE_STRING )", 7, 0, input);
throw nvae;
}
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:18: 'keyword'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:18: 'keyword'
{
- match(input,20,FOLLOW_20_in_ruleFamilie1044);
+ match(input,20,FOLLOW_20_in_ruleFamilie1030);
createLeafNode(grammarAccess.prFamilie().ele000001000KeywordKeyword(), "name");
@@ -1096,11 +1096,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:512:7: RULE_STRING
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:505:7: RULE_STRING
{
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1061);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1047);
- createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name");
+ createLeafNode(grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING(), "name");
}
@@ -1112,11 +1112,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:518:7: RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:511:7: RULE_ID
{
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1075);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1061);
- createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prFamilie().ele00000101ParserRuleCallID(), "name");
}
@@ -1142,8 +1142,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:537:3: ( RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:540:3: RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:530:3: ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:533:3: RULE_ID
{
if (current==null) {
@@ -1151,7 +1151,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1108);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1094);
createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter");
@@ -1161,8 +1161,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:553:3: ( RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:556:3: RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:546:3: ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:549:3: RULE_ID
{
if (current==null) {
@@ -1170,7 +1170,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1134);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1120);
createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater");
@@ -1180,8 +1180,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:569:3: ( RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:572:3: RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:562:3: ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:565:3: RULE_ID
{
if (current==null) {
@@ -1189,7 +1189,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1160);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1146);
createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder");
@@ -1199,7 +1199,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:3: ( ',' ( RULE_ID ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:578:3: ( ',' ( RULE_ID ) )*
loop9:
do {
int alt9=2;
@@ -1212,14 +1212,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:4: ',' ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:578:4: ',' ( RULE_ID )
{
- match(input,21,FOLLOW_21_in_ruleFamilie1174);
+ match(input,21,FOLLOW_21_in_ruleFamilie1160);
createLeafNode(grammarAccess.prFamilie().ele010KeywordComma(), null);
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:589:1: ( RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:592:3: RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:582:1: ( RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:3: RULE_ID
{
if (current==null) {
@@ -1227,7 +1227,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1196);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1182);
createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder");
@@ -1246,7 +1246,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
- match(input,16,FOLLOW_16_in_ruleFamilie1211);
+ match(input,16,FOLLOW_16_in_ruleFamilie1197);
createLeafNode(grammarAccess.prFamilie().ele1KeywordRightParenthesis(), null);
@@ -1273,7 +1273,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleFarbe
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:618:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:611:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ;
public final EObject entryRuleFarbe() throws RecognitionException {
EObject current = null;
@@ -1281,16 +1281,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:618:47: (iv_ruleFarbe= ruleFarbe EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:2: iv_ruleFarbe= ruleFarbe EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:611:47: (iv_ruleFarbe= ruleFarbe EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:612:2: iv_ruleFarbe= ruleFarbe EOF
{
currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode);
- pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1246);
+ pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1232);
iv_ruleFarbe=ruleFarbe();
_fsp--;
current =iv_ruleFarbe;
- match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1256);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1242);
}
@@ -1308,7 +1308,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleFarbe
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:626:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ;
public final EObject ruleFarbe() throws RecognitionException {
EObject current = null;
@@ -1317,13 +1317,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:631:6: ( (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:632:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:624:6: ( (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:625:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:632:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:6: lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:625:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:6: lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1335,15 +1335,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("634:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )", 12, 0, input);
+ new NoViableAltException("627:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )", 12, 0, input);
throw nvae;
}
switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1355,15 +1355,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input);
+ new NoViableAltException("627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input);
throw nvae;
}
switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:18: ( 'ROT' | 'BLAU' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:18: ( 'ROT' | 'BLAU' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:18: ( 'ROT' | 'BLAU' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:18: ( 'ROT' | 'BLAU' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1375,15 +1375,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
else {
NoViableAltException nvae =
- new NoViableAltException("634:18: ( 'ROT' | 'BLAU' )", 10, 0, input);
+ new NoViableAltException("627:18: ( 'ROT' | 'BLAU' )", 10, 0, input);
throw nvae;
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:19: 'ROT'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:19: 'ROT'
{
- match(input,22,FOLLOW_22_in_ruleFarbe1304);
+ match(input,22,FOLLOW_22_in_ruleFarbe1290);
createLeafNode(grammarAccess.prFarbe().ele0000KeywordROT(), "wert");
@@ -1391,9 +1391,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'BLAU'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:633:6: 'BLAU'
{
- match(input,23,FOLLOW_23_in_ruleFarbe1320);
+ match(input,23,FOLLOW_23_in_ruleFarbe1306);
createLeafNode(grammarAccess.prFarbe().ele0001KeywordBLAU(), "wert");
@@ -1407,9 +1407,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:647:6: 'GELB'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GELB'
{
- match(input,24,FOLLOW_24_in_ruleFarbe1338);
+ match(input,24,FOLLOW_24_in_ruleFarbe1324);
createLeafNode(grammarAccess.prFarbe().ele001KeywordGELB(), "wert");
@@ -1423,9 +1423,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 2 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:654:6: 'GR\\u00DCN'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:647:6: 'GR\\u00DCN'
{
- match(input,25,FOLLOW_25_in_ruleFarbe1356);
+ match(input,25,FOLLOW_25_in_ruleFarbe1342);
createLeafNode(grammarAccess.prFarbe().ele01KeywordGRÜN(), "wert");
@@ -1470,7 +1470,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start entryRuleCustomTypeParserRule
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:683:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ;
public final EObject entryRuleCustomTypeParserRule() throws RecognitionException {
EObject current = null;
@@ -1478,16 +1478,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:683:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:677:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF
{
currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode);
- pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1405);
+ pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1391);
iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule();
_fsp--;
current =iv_ruleCustomTypeParserRule;
- match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1415);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1401);
}
@@ -1505,7 +1505,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleCustomTypeParserRule
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:691:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name_1= RULE_ID ) ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name_1= RULE_ID ) ) ;
public final EObject ruleCustomTypeParserRule() throws RecognitionException {
EObject current = null;
@@ -1514,23 +1514,23 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:696:6: ( ( 'type' (lv_name_1= RULE_ID ) ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:1: ( 'type' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:689:6: ( ( 'type' (lv_name_1= RULE_ID ) ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:1: ( 'type' (lv_name_1= RULE_ID ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:1: ( 'type' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:2: 'type' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:1: ( 'type' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:2: 'type' (lv_name_1= RULE_ID )
{
- match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1449);
+ match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1435);
createLeafNode(grammarAccess.prCustomTypeParserRule().ele0KeywordType(), null);
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:701:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:703:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:694:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:696:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1471);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1456);
- createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID(), "name");
if (current==null) {
@@ -1574,58 +1574,58 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
public static final BitSet FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz72 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleSpielplatz82 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_11_in_ruleSpielplatz120 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleSpielplatz142 = new BitSet(new long[]{0x0000000000001020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz173 = new BitSet(new long[]{0x0000000000001000L});
- public static final BitSet FOLLOW_12_in_ruleSpielplatz192 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz231 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz275 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz320 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz365 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz410 = new BitSet(new long[]{0x00000000040E6000L});
- public static final BitSet FOLLOW_13_in_ruleSpielplatz426 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKind_in_entryRuleKind464 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleKind474 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleKind511 = new BitSet(new long[]{0x0000000000008000L});
- public static final BitSet FOLLOW_15_in_ruleKind520 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleKind543 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleKind574 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_16_in_ruleKind592 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener627 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener637 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_ruleErwachsener674 = new BitSet(new long[]{0x0000000000008000L});
- public static final BitSet FOLLOW_15_in_ruleErwachsener683 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener706 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener737 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_16_in_ruleErwachsener755 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug790 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug800 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_ruleSpielzeug837 = new BitSet(new long[]{0x0000000000008000L});
- public static final BitSet FOLLOW_15_in_ruleSpielzeug846 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug869 = new BitSet(new long[]{0x0000000003C00000L});
- public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug912 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_16_in_ruleSpielzeug926 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie961 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFamilie971 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_19_in_ruleFamilie1011 = new BitSet(new long[]{0x0000000000008000L});
- public static final BitSet FOLLOW_15_in_ruleFamilie1020 = new BitSet(new long[]{0x0000000000100060L});
- public static final BitSet FOLLOW_20_in_ruleFamilie1044 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1061 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1075 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1108 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1134 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1160 = new BitSet(new long[]{0x0000000000210000L});
- public static final BitSet FOLLOW_21_in_ruleFamilie1174 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1196 = new BitSet(new long[]{0x0000000000210000L});
- public static final BitSet FOLLOW_16_in_ruleFamilie1211 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1246 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1256 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_22_in_ruleFarbe1304 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_23_in_ruleFarbe1320 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_ruleFarbe1338 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_25_in_ruleFarbe1356 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1405 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1415 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1449 = new BitSet(new long[]{0x0000000000000040L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1471 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleSpielplatz141 = new BitSet(new long[]{0x0000000000001020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz170 = new BitSet(new long[]{0x0000000000001000L});
+ public static final BitSet FOLLOW_12_in_ruleSpielplatz188 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz227 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz271 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz316 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz361 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz406 = new BitSet(new long[]{0x00000000040E6000L});
+ public static final BitSet FOLLOW_13_in_ruleSpielplatz422 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKind_in_entryRuleKind460 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleKind470 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_14_in_ruleKind507 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleKind516 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleKind538 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleKind567 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleKind584 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener619 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener629 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_17_in_ruleErwachsener666 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleErwachsener675 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener697 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener726 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleErwachsener743 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug778 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug788 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleSpielzeug825 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleSpielzeug834 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug856 = new BitSet(new long[]{0x0000000003C00000L});
+ public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug898 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_16_in_ruleSpielzeug912 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie947 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFamilie957 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_19_in_ruleFamilie997 = new BitSet(new long[]{0x0000000000008000L});
+ public static final BitSet FOLLOW_15_in_ruleFamilie1006 = new BitSet(new long[]{0x0000000000100060L});
+ public static final BitSet FOLLOW_20_in_ruleFamilie1030 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1047 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1061 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1094 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1120 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1146 = new BitSet(new long[]{0x0000000000210000L});
+ public static final BitSet FOLLOW_21_in_ruleFamilie1160 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1182 = new BitSet(new long[]{0x0000000000210000L});
+ public static final BitSet FOLLOW_16_in_ruleFamilie1197 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1232 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1242 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_22_in_ruleFarbe1290 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_23_in_ruleFarbe1306 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_ruleFarbe1324 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_25_in_ruleFarbe1342 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1391 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1401 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1435 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1456 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
index 207a484..82249e6 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
@@ -24,28 +24,39 @@ T24 : 'GELB' ;
T25 : 'GR\u00DCN' ;
T26 : 'type' ;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 745
-RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 757
+RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 747
+
+
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 761
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 749
-RULE_STRING :
- '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |
- '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''
- ;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 754
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/';
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 756
-RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?;
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 765
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+
+
+
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 769
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 758
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 773
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 760
+
+
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 777
+RULE_WS : (((' '|'\t')|'\r')|'\n')+;
+
+
+
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 781
RULE_ANY_OTHER : .;
+
+
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java
index bee6094..24a5079 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java
@@ -26,6 +26,6 @@ public final class ReferenceGrammarDelimiters {
public static final ISequenceMatcher ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher();
public static final ISequenceMatcher ruleCall$44$Delimiter = new SetBasedKeywordMatcher(
- "spielplatz", "kind", "erwachsener", "spielzeug", "familie", "keyword", "ROT", "BLAU", "GELB", "GRÜN", "type");
+ "spielplatz", "kind", "erwachsener", "spielzeug", "familie", "keyword", "ROT", "BLAU", "GELB", "type");
}
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 609f995..f731096 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
@@ -8,7 +8,7 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
-import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration;
+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;
@@ -18,17 +18,17 @@ import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarSpie
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarFamilieConsumer;
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarFarbeConsumer;
import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarCustomTypeParserRuleConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinINTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinML_COMMENTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSTRINGConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsML_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSL_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsWSConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsumer;
public class ReferenceGrammarParserConfiguration extends AbstractParserConfiguration {
- private final XtextBuiltinParserConfiguration xtextBuiltinConfiguration;
+ private final TerminalsParserConfiguration terminalsConfiguration;
private ReferenceGrammarSpielplatzConsumer spielplatzConsumer;
private ReferenceGrammarPersonConsumer personConsumer;
@@ -44,7 +44,7 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
public ReferenceGrammarParserConfiguration(IInternalParserConfiguration configuration, ReferenceGrammarGrammarAccess grammarAccess) {
super(configuration);
this.grammarAccess = grammarAccess;
- this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration, null);
+ this.terminalsConfiguration = new TerminalsParserConfiguration(configuration, null);
}
public ReferenceGrammarSpielplatzConsumer getRootConsumer() {
@@ -52,7 +52,7 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
}
public void createNonTerminalConsumers() {
- getXtextBuiltinConfiguration().createNonTerminalConsumers();
+ getTerminalsConfiguration().createNonTerminalConsumers();
spielplatzConsumer = new ReferenceGrammarSpielplatzConsumer(
this, null
);
@@ -80,7 +80,7 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
}
public void createTerminalConsumers() {
- getXtextBuiltinConfiguration().createTerminalConsumers();
+ getTerminalsConfiguration().createTerminalConsumers();
}
public void configureConsumers() {
@@ -94,13 +94,13 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
getFamilieConsumer().setRule(grammarAccess.prFamilie());
getFarbeConsumer().setRule(grammarAccess.prFarbe());
getCustomTypeParserRuleConsumer().setRule(grammarAccess.prCustomTypeParserRule());
- getIdConsumer().setRule(grammarAccess.lrID());
- getIntConsumer().setRule(grammarAccess.lrINT());
- getStringConsumer().setRule(grammarAccess.lrSTRING());
- getMlCommentConsumer().setRule(grammarAccess.lrML_COMMENT());
- getSlCommentConsumer().setRule(grammarAccess.lrSL_COMMENT());
- getWsConsumer().setRule(grammarAccess.lrWS());
- getAnyOtherConsumer().setRule(grammarAccess.lrANY_OTHER());
+ getIdConsumer().setRule(grammarAccess.prID());
+ getIntConsumer().setRule(grammarAccess.prINT());
+ getStringConsumer().setRule(grammarAccess.prSTRING());
+ getMlCommentConsumer().setRule(grammarAccess.prML_COMMENT());
+ getSlCommentConsumer().setRule(grammarAccess.prSL_COMMENT());
+ getWsConsumer().setRule(grammarAccess.prWS());
+ getAnyOtherConsumer().setRule(grammarAccess.prANY_OTHER());
getSpielplatzConsumer().setCustomTypeParserRuleConsumer(getCustomTypeParserRuleConsumer());
@@ -167,8 +167,8 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
}
// TODO collect superGrammars transitive
- public XtextBuiltinParserConfiguration getXtextBuiltinConfiguration() {
- return xtextBuiltinConfiguration;
+ public TerminalsParserConfiguration getTerminalsConfiguration() {
+ return terminalsConfiguration;
}
public ReferenceGrammarSpielplatzConsumer getSpielplatzConsumer() {
@@ -203,38 +203,38 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
return customTypeParserRuleConsumer;
}
- public XtextBuiltinIDConsumer getIdConsumer() {
- return getXtextBuiltinConfiguration().getIdConsumer();
+ public TerminalsIDConsumer getIdConsumer() {
+ return getTerminalsConfiguration().getIdConsumer();
}
- public XtextBuiltinINTConsumer getIntConsumer() {
- return getXtextBuiltinConfiguration().getIntConsumer();
+ public TerminalsINTConsumer getIntConsumer() {
+ return getTerminalsConfiguration().getIntConsumer();
}
- public XtextBuiltinSTRINGConsumer getStringConsumer() {
- return getXtextBuiltinConfiguration().getStringConsumer();
+ public TerminalsSTRINGConsumer getStringConsumer() {
+ return getTerminalsConfiguration().getStringConsumer();
}
- public XtextBuiltinML_COMMENTConsumer getMlCommentConsumer() {
- return getXtextBuiltinConfiguration().getMlCommentConsumer();
+ public TerminalsML_COMMENTConsumer getMlCommentConsumer() {
+ return getTerminalsConfiguration().getMlCommentConsumer();
}
- public XtextBuiltinSL_COMMENTConsumer getSlCommentConsumer() {
- return getXtextBuiltinConfiguration().getSlCommentConsumer();
+ public TerminalsSL_COMMENTConsumer getSlCommentConsumer() {
+ return getTerminalsConfiguration().getSlCommentConsumer();
}
- public XtextBuiltinWSConsumer getWsConsumer() {
- return getXtextBuiltinConfiguration().getWsConsumer();
+ public TerminalsWSConsumer getWsConsumer() {
+ return getTerminalsConfiguration().getWsConsumer();
}
- public XtextBuiltinANY_OTHERConsumer getAnyOtherConsumer() {
- return getXtextBuiltinConfiguration().getAnyOtherConsumer();
+ public TerminalsANY_OTHERConsumer getAnyOtherConsumer() {
+ return getTerminalsConfiguration().getAnyOtherConsumer();
}
@Override
public ITerminalConsumer[] getInitialHiddenTerminals() {
- return getXtextBuiltinConfiguration().getInitialHiddenTerminals();
+ return getTerminalsConfiguration().getInitialHiddenTerminals();
}
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
index 0c557b4..5701a8a 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
@@ -108,7 +108,7 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordType());
assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
- ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10LexerRuleCallID());
+ ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallID());
}
@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
index b24625b..14658fa 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
@@ -179,9 +179,9 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordErwachsener());
keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis());
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010LexerRuleCallID());
+ ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID());
assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentAge());
- ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010LexerRuleCallINT());
+ ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallINT());
keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis());
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index f19e569..b1cdd45 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -361,11 +361,11 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
assignment$10$Consumer = new Assignment$10$Consumer(rule.ele000001AssignmentName());
alternatives$11$Consumer = new Alternatives$11$Consumer(rule.ele0000010Alternatives());
keyword$13$Consumer = new Keyword$13$Consumer(rule.ele000001000KeywordKeyword());
- ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001LexerRuleCallSTRING());
- ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101LexerRuleCallID());
+ ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001ParserRuleCallSTRING());
+ ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101ParserRuleCallID());
keyword$13$Consumer = new Keyword$13$Consumer(rule.ele000001000KeywordKeyword());
- ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001LexerRuleCallSTRING());
- ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101LexerRuleCallID());
+ ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001ParserRuleCallSTRING());
+ ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101ParserRuleCallID());
assignment$16$Consumer = new Assignment$16$Consumer(rule.ele00001AssignmentMutter());
crossReference$17$Consumer = new CrossReference$17$Consumer(rule.ele000010CrossReferenceEStringErwachsener());
assignment$19$Consumer = new Assignment$19$Consumer(rule.ele0001AssignmentVater());
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
index 0f81e79..7d470ba 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
@@ -179,9 +179,9 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordKind());
keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis());
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010LexerRuleCallID());
+ ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID());
assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentAge());
- ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010LexerRuleCallINT());
+ ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallINT());
keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis());
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
index f84ecf1..e544fa7 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
@@ -349,9 +349,9 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$6$Consumer = new Keyword$6$Consumer(rule.ele00000KeywordSpielplatz());
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele00001AssignmentGroesse());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010LexerRuleCallINT());
+ ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010ParserRuleCallINT());
assignment$9$Consumer = new Assignment$9$Consumer(rule.ele0001AssignmentBeschreibung());
- ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele00010LexerRuleCallSTRING());
+ ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele00010ParserRuleCallSTRING());
keyword$11$Consumer = new Keyword$11$Consumer(rule.ele001KeywordLeftCurlyBracket());
alternatives$12$Consumer = new Alternatives$12$Consumer(rule.ele01Alternatives());
assignment$16$Consumer = new Assignment$16$Consumer(rule.ele010000AssignmentKinder());
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
index aab8159..024cde0 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
@@ -177,7 +177,7 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordSpielzeug());
keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis());
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010LexerRuleCallID());
+ ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID());
assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentFarbe());
ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallFarbe());
keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis());
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 145dd27..4ad0dea 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
@@ -11,7 +11,7 @@ import org.eclipse.xtext.*;
import org.eclipse.xtext.service.GrammarProvider;
-import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
@Singleton
public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
@@ -26,9 +26,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Group c0000Group = (Group)c000Group.eContents().get(0);
private final Keyword c00000KeywordSpielplatz = (Keyword)c0000Group.eContents().get(0);
private final Assignment c00001AssignmentGroesse = (Assignment)c0000Group.eContents().get(1);
- private final RuleCall c000010LexerRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0);
+ private final RuleCall c000010ParserRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0);
private final Assignment c0001AssignmentBeschreibung = (Assignment)c000Group.eContents().get(1);
- private final RuleCall c00010LexerRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0);
+ private final RuleCall c00010ParserRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0);
private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
private final Alternatives c010Alternatives = (Alternatives)c01Alternatives.eContents().get(0);
@@ -71,13 +71,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Assignment ele00001AssignmentGroesse() { return c00001AssignmentGroesse; }
// not supported
- public RuleCall ele000010LexerRuleCallINT() { return c000010LexerRuleCallINT; }
+ public RuleCall ele000010ParserRuleCallINT() { return c000010ParserRuleCallINT; }
// not supported
public Assignment ele0001AssignmentBeschreibung() { return c0001AssignmentBeschreibung; }
// not supported
- public RuleCall ele00010LexerRuleCallSTRING() { return c00010LexerRuleCallSTRING; }
+ public RuleCall ele00010ParserRuleCallSTRING() { return c00010ParserRuleCallSTRING; }
// not supported
public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
@@ -156,9 +156,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Keyword c0000KeywordKind = (Keyword)c000Group.eContents().get(0);
private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
- private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+ private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1);
- private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
+ private final RuleCall c010ParserRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
// not supported
@@ -186,13 +186,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Assignment ele001AssignmentName() { return c001AssignmentName; }
// not supported
- public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
+ public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; }
// not supported
public Assignment ele01AssignmentAge() { return c01AssignmentAge; }
// not supported
- public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
+ public RuleCall ele010ParserRuleCallINT() { return c010ParserRuleCallINT; }
// not supported
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
@@ -207,9 +207,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Keyword c0000KeywordErwachsener = (Keyword)c000Group.eContents().get(0);
private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
- private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+ private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1);
- private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
+ private final RuleCall c010ParserRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
// not supported
@@ -237,13 +237,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Assignment ele001AssignmentName() { return c001AssignmentName; }
// not supported
- public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
+ public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; }
// not supported
public Assignment ele01AssignmentAge() { return c01AssignmentAge; }
// not supported
- public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
+ public RuleCall ele010ParserRuleCallINT() { return c010ParserRuleCallINT; }
// not supported
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
@@ -258,7 +258,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Keyword c0000KeywordSpielzeug = (Keyword)c000Group.eContents().get(0);
private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
- private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+ private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
private final Assignment c01AssignmentFarbe = (Assignment)c0Group.eContents().get(1);
private final RuleCall c010ParserRuleCallFarbe = (RuleCall)c01AssignmentFarbe.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
@@ -288,7 +288,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Assignment ele001AssignmentName() { return c001AssignmentName; }
// not supported
- public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
+ public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; }
// not supported
public Assignment ele01AssignmentFarbe() { return c01AssignmentFarbe; }
@@ -315,8 +315,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Alternatives c0000010Alternatives = (Alternatives)c000001AssignmentName.eContents().get(0);
private final Alternatives c00000100Alternatives = (Alternatives)c0000010Alternatives.eContents().get(0);
private final Keyword c000001000KeywordKeyword = (Keyword)c00000100Alternatives.eContents().get(0);
- private final RuleCall c000001001LexerRuleCallSTRING = (RuleCall)c00000100Alternatives.eContents().get(1);
- private final RuleCall c00000101LexerRuleCallID = (RuleCall)c0000010Alternatives.eContents().get(1);
+ private final RuleCall c000001001ParserRuleCallSTRING = (RuleCall)c00000100Alternatives.eContents().get(1);
+ private final RuleCall c00000101ParserRuleCallID = (RuleCall)c0000010Alternatives.eContents().get(1);
private final Assignment c00001AssignmentMutter = (Assignment)c0000Group.eContents().get(1);
private final CrossReference c000010CrossReferenceEStringErwachsener = (CrossReference)c00001AssignmentMutter.eContents().get(0);
private final Assignment c0001AssignmentVater = (Assignment)c000Group.eContents().get(1);
@@ -372,10 +372,10 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Keyword ele000001000KeywordKeyword() { return c000001000KeywordKeyword; }
// not supported
- public RuleCall ele000001001LexerRuleCallSTRING() { return c000001001LexerRuleCallSTRING; }
+ public RuleCall ele000001001ParserRuleCallSTRING() { return c000001001ParserRuleCallSTRING; }
// not supported
- public RuleCall ele00000101LexerRuleCallID() { return c00000101LexerRuleCallID; }
+ public RuleCall ele00000101ParserRuleCallID() { return c00000101ParserRuleCallID; }
// not supported
public Assignment ele00001AssignmentMutter() { return c00001AssignmentMutter; }
@@ -455,7 +455,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword c0KeywordType = (Keyword)cGroup.eContents().get(0);
private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
- private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
+ private final RuleCall c10ParserRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
// not supported
public ParserRule getRule() { return rule; }
@@ -470,7 +470,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public Assignment ele1AssignmentName() { return c1AssignmentName; }
// not supported
- public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
+ public RuleCall ele10ParserRuleCallID() { return c10ParserRuleCallID; }
}
private SpielplatzElements pSpielplatz;
@@ -484,10 +484,10 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private XtextBuiltinGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess superGrammarAccess;
@Inject
- public ReferenceGrammarGrammarAccess(GrammarProvider grammarProvider, XtextBuiltinGrammarAccess superGrammarAccess) {
+ public ReferenceGrammarGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
this.grammarProvider = grammarProvider;
this.superGrammarAccess = superGrammarAccess;
}
@@ -497,7 +497,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
}
- public XtextBuiltinGrammarAccess getSuperGrammarAccess() {
+ public TerminalsGrammarAccess getSuperGrammarAccess() {
return superGrammarAccess;
}
@@ -543,37 +543,37 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
}
// not supported
- public LexerRule lrID() {
- return superGrammarAccess.lrID();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.IDElements prID() {
+ return superGrammarAccess.prID();
}
// not supported
- public LexerRule lrINT() {
- return superGrammarAccess.lrINT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.INTElements prINT() {
+ return superGrammarAccess.prINT();
}
// not supported
- public LexerRule lrSTRING() {
- return superGrammarAccess.lrSTRING();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.STRINGElements prSTRING() {
+ return superGrammarAccess.prSTRING();
}
// not supported
- public LexerRule lrML_COMMENT() {
- return superGrammarAccess.lrML_COMMENT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ML_COMMENTElements prML_COMMENT() {
+ return superGrammarAccess.prML_COMMENT();
}
// not supported
- public LexerRule lrSL_COMMENT() {
- return superGrammarAccess.lrSL_COMMENT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.SL_COMMENTElements prSL_COMMENT() {
+ return superGrammarAccess.prSL_COMMENT();
}
// not supported
- public LexerRule lrWS() {
- return superGrammarAccess.lrWS();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.WSElements prWS() {
+ return superGrammarAccess.prWS();
}
// not supported
- public LexerRule lrANY_OTHER() {
- return superGrammarAccess.lrANY_OTHER();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ANY_OTHERElements prANY_OTHER() {
+ return superGrammarAccess.prANY_OTHER();
}
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
index 137692e..4e2840d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
@@ -17,7 +17,7 @@ public abstract class AbstractDomainmodelUiModule extends DefaultUIModule {
}
public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
- return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.BuiltinAntlrTokenColorer.class;
+ return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
}
public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java
index ecbc2c8..4ae618a 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java
@@ -241,6 +241,20 @@ public class GenDomainmodelProposals extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
+
+
+ public List<? extends ICompletionProposal> completeEcore_EInt(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("completeEcore_EInt '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+ + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
+ }
+ return Collections.emptyList();
+ }
+
+
+
+
+
@Override
protected String getDefaultImageFilePath() {
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 decbd82..f43f927 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
@@ -269,44 +269,197 @@
</alternatives>
</rules>
</xtext:Grammar>
- <xtext:Grammar name="org.eclipse.xtext.builtin.XtextBuiltin" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
+ <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
<ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
</metamodelDeclarations>
- <rules xsi:type="xtext:LexerRule" name="ID" body="('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*">
+ <rules xsi:type="xtext:ParserRule" name="ID" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="0"/>
+ <right value="9"/>
+ </groups>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="INT" body="('0'..'9')+">
+ <rules xsi:type="xtext:ParserRule" name="INT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</type>
+ <alternatives xsi:type="xtext:CharacterRange" cardinality="+">
+ <left value="0"/>
+ <right value="9"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="STRING" body="&#xA;&#x9;&#x9;&#x9; '&quot;' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'&quot;') )* '&quot;' | &#xA; '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'\'') )* '\''&#xA; ">
+ <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ML_COMMENT" body="'/*' ( options {greedy=false;} : . )* '*/'">
+ <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="/*"/>
+ <abstractTokens xsi:type="xtext:UpToToken">
+ <terminal xsi:type="xtext:Keyword" value="*/"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="SL_COMMENT" body="'//' ~('\n'|'\r')* ('\r'? '\n')?">
+ <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="//"/>
+ <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </terminal>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Group" cardinality="?">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="&#xA;"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="WS" body="(' '|'\t'|'\r'|'\n')+">
+ <rules xsi:type="xtext:ParserRule" name="WS" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives" cardinality="+">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value=" "/>
+ <groups xsi:type="xtext:Keyword" value="&#x9;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ANY_OTHER" body=".">
+ <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Wildcard" isWildcard="true"/>
</rules>
</xtext:Grammar>
</xmi:XMI>
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 6dce169..6325492 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
@@ -1,4 +1,3 @@
-
package org.eclipse.xtext.example;
import org.eclipse.emf.ecore.EPackage;
@@ -21,7 +20,7 @@ public class DomainmodelStandaloneSetup implements ISetup {
public Injector createInjectorAndDoEMFRegistration() {
- org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup.doSetup();
+ org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
register(injector);
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
index 7e20de2..8d36658 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
@@ -213,11 +213,13 @@ protected class Import_1_Assignment_importURI extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("importURI",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("importURI");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prImport().ele10LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prImport().ele10ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -669,11 +671,13 @@ protected class DataType_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prDataType().ele10LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prDataType().ele10ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -867,11 +871,13 @@ protected class Entity_0_0_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEntity().ele000010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEntity().ele000010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1285,11 +1291,13 @@ protected class Attribute_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prAttribute().ele0010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prAttribute().ele0010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1500,11 +1508,13 @@ protected class Reference_0_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prReference().ele00010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prReference().ele00010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1847,11 +1857,13 @@ protected class Operation_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prOperation().ele0000010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prOperation().ele0000010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -2127,11 +2139,13 @@ protected class Parameter_0_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prParameter().ele00LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prParameter().ele00ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -2285,4 +2299,11 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken {
/************ end Rule TypeRef ****************/
+
+
+
+
+
+
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
index 016eb8c..697f7c3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
@@ -152,9 +152,8 @@ ruleImport returns [EObject current=null]
}
(
- lv_importURI_1= RULE_STRING
- {
- createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI");
+ lv_importURI_1=RULE_STRING {
+ createLeafNode(grammarAccess.prImport().ele10ParserRuleCallSTRING(), "importURI");
}
{
@@ -360,9 +359,8 @@ ruleDataType returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prDataType().ele10ParserRuleCallID(), "name");
}
{
@@ -407,9 +405,8 @@ ruleEntity returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prEntity().ele000010ParserRuleCallID(), "name");
}
{
@@ -587,9 +584,8 @@ ruleAttribute returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prAttribute().ele0010ParserRuleCallID(), "name");
}
{
@@ -659,9 +655,8 @@ ruleReference returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prReference().ele00010ParserRuleCallID(), "name");
}
{
@@ -751,9 +746,8 @@ ruleOperation returns [EObject current=null]
}
(
- lv_name_1= RULE_ID
- {
- createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name");
+ lv_name_1=RULE_ID {
+ createLeafNode(grammarAccess.prOperation().ele0000010ParserRuleCallID(), "name");
}
{
@@ -873,9 +867,8 @@ ruleParameter returns [EObject current=null]
}:
((
- lv_name_0= RULE_ID
- {
- createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name");
+ lv_name_0=RULE_ID {
+ createLeafNode(grammarAccess.prParameter().ele00ParserRuleCallID(), "name");
}
{
@@ -982,7 +975,7 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
}
{
- createLeafNode(grammarAccess.prQualifiedName().ele0LexerRuleCallID(), null);
+ createLeafNode(grammarAccess.prQualifiedName().ele0ParserRuleCallID(), null);
}
(
kw='.'
@@ -995,7 +988,7 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
}
{
- createLeafNode(grammarAccess.prQualifiedName().ele11LexerRuleCallID(), null);
+ createLeafNode(grammarAccess.prQualifiedName().ele11ParserRuleCallID(), null);
}
)*)
;
@@ -1038,21 +1031,50 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
-RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*;
+
+
RULE_INT : ('0'..'9')+;
-RULE_STRING :
- '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |
- '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''
- ;
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/';
-RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?;
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+
+
+
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+
+
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+
+
+
+RULE_WS : (((' '|'\t')|'\r')|'\n')+;
+
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
RULE_ANY_OTHER : .;
+
+
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
index 0d78f94..83fbbc4 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
@@ -343,10 +343,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:9: ( ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:11: ( '^' )? ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:11: ( '^' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -355,7 +355,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:12: '^'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:11: '^'
{
match('^');
@@ -374,7 +374,7 @@ public class InternalDomainmodelLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -422,10 +422,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -439,7 +439,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:13: '0' .. '9'
{
matchRange('0','9');
@@ -469,7 +469,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1045:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ {
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -481,16 +484,16 @@ public class InternalDomainmodelLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("1045:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input);
+ new NoViableAltException("1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -506,7 +509,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:12: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060: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' ) {
@@ -523,7 +526,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:56: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:76: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -549,10 +552,10 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -568,7 +571,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060: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' ) {
@@ -585,7 +588,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:66: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:158: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -612,6 +615,10 @@ public class InternalDomainmodelLexer extends Lexer {
break;
}
+
+
+ }
+
this.type = _type;
}
finally {
@@ -623,12 +630,12 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -653,7 +660,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:52: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:52: .
{
matchAny();
@@ -681,12 +688,12 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -699,7 +706,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068: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();
@@ -720,7 +727,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -729,9 +736,9 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: ( '\\r' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -740,7 +747,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: '\\r'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:41: '\\r'
{
match('\r');
@@ -770,10 +777,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1072:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1072:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1072:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -826,8 +833,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:16: ( . )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:18: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1076:16: ( . )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1076:18: .
{
matchAny();
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
index 419ff8b..87dc2d1 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
@@ -287,9 +287,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:155:6: lv_importURI_1= RULE_STRING
{
lv_importURI_1=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport286);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285);
- createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI");
+ createLeafNode(grammarAccess.prImport().ele10ParserRuleCallSTRING(), "importURI");
if (current==null) {
@@ -329,7 +329,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleNamedElement
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:181:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ;
public final EObject entryRuleNamedElement() throws RecognitionException {
EObject current = null;
@@ -337,16 +337,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:54: (iv_ruleNamedElement= ruleNamedElement EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:183:2: iv_ruleNamedElement= ruleNamedElement EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:181:54: (iv_ruleNamedElement= ruleNamedElement EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:2: iv_ruleNamedElement= ruleNamedElement EOF
{
currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode);
- pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement329);
+ pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement327);
iv_ruleNamedElement=ruleNamedElement();
_fsp--;
current =iv_ruleNamedElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement339);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement337);
}
@@ -364,7 +364,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleNamedElement
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:190:1: ruleNamedElement returns [EObject current=null] : (this_Package_0= rulePackage | this_Type_1= ruleType ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:189:1: ruleNamedElement returns [EObject current=null] : (this_Package_0= rulePackage | this_Type_1= ruleType ) ;
public final EObject ruleNamedElement() throws RecognitionException {
EObject current = null;
@@ -376,10 +376,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:195:6: ( (this_Package_0= rulePackage | this_Type_1= ruleType ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:196:1: (this_Package_0= rulePackage | this_Type_1= ruleType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:194:6: ( (this_Package_0= rulePackage | this_Type_1= ruleType ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:195:1: (this_Package_0= rulePackage | this_Type_1= ruleType )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:196:1: (this_Package_0= rulePackage | this_Type_1= ruleType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:195:1: (this_Package_0= rulePackage | this_Type_1= ruleType )
int alt3=2;
int LA3_0 = input.LA(1);
@@ -391,18 +391,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("196:1: (this_Package_0= rulePackage | this_Type_1= ruleType )", 3, 0, input);
+ new NoViableAltException("195:1: (this_Package_0= rulePackage | this_Type_1= ruleType )", 3, 0, input);
throw nvae;
}
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:197:5: this_Package_0= rulePackage
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:196:5: this_Package_0= rulePackage
{
currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode);
- pushFollow(FOLLOW_rulePackage_in_ruleNamedElement386);
+ pushFollow(FOLLOW_rulePackage_in_ruleNamedElement384);
this_Package_0=rulePackage();
_fsp--;
@@ -414,12 +414,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:207:5: this_Type_1= ruleType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:206:5: this_Type_1= ruleType
{
currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode);
- pushFollow(FOLLOW_ruleType_in_ruleNamedElement413);
+ pushFollow(FOLLOW_ruleType_in_ruleNamedElement411);
this_Type_1=ruleType();
_fsp--;
@@ -453,7 +453,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRulePackage
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:223:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ;
public final EObject entryRulePackage() throws RecognitionException {
EObject current = null;
@@ -461,16 +461,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:49: (iv_rulePackage= rulePackage EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:225:2: iv_rulePackage= rulePackage EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:223:49: (iv_rulePackage= rulePackage EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:2: iv_rulePackage= rulePackage EOF
{
currentNode = createCompositeNode(grammarAccess.prPackage().getRule(), currentNode);
- pushFollow(FOLLOW_rulePackage_in_entryRulePackage447);
+ pushFollow(FOLLOW_rulePackage_in_entryRulePackage445);
iv_rulePackage=rulePackage();
_fsp--;
current =iv_rulePackage;
- match(input,EOF,FOLLOW_EOF_in_entryRulePackage457);
+ match(input,EOF,FOLLOW_EOF_in_entryRulePackage455);
}
@@ -488,7 +488,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start rulePackage
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:231:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) ;
public final EObject rulePackage() throws RecognitionException {
EObject current = null;
@@ -500,32 +500,32 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:6: ( ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:236:6: ( ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )*
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) '{'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) '{'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:4: ( 'package' (lv_name_1= ruleQualifiedName ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:5: 'package' (lv_name_1= ruleQualifiedName )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:4: ( 'package' (lv_name_1= ruleQualifiedName ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:5: 'package' (lv_name_1= ruleQualifiedName )
{
- match(input,12,FOLLOW_12_in_rulePackage494);
+ match(input,12,FOLLOW_12_in_rulePackage492);
createLeafNode(grammarAccess.prPackage().ele0000KeywordPackage(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:242:1: (lv_name_1= ruleQualifiedName )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:245:6: lv_name_1= ruleQualifiedName
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:241:1: (lv_name_1= ruleQualifiedName )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:244:6: lv_name_1= ruleQualifiedName
{
currentNode=createCompositeNode(grammarAccess.prPackage().ele00010ParserRuleCallQualifiedName(), currentNode);
- pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage528);
+ pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage526);
lv_name_1=ruleQualifiedName();
_fsp--;
@@ -548,14 +548,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,13,FOLLOW_13_in_rulePackage542);
+ match(input,13,FOLLOW_13_in_rulePackage540);
createLeafNode(grammarAccess.prPackage().ele001KeywordLeftCurlyBracket(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:267:2: (lv_namedElements_3= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:266:2: (lv_namedElements_3= ruleNamedElement )*
loop4:
do {
int alt4=2;
@@ -568,12 +568,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:270:6: lv_namedElements_3= ruleNamedElement
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:269:6: lv_namedElements_3= ruleNamedElement
{
currentNode=createCompositeNode(grammarAccess.prPackage().ele010ParserRuleCallNamedElement(), currentNode);
- pushFollow(FOLLOW_ruleNamedElement_in_rulePackage577);
+ pushFollow(FOLLOW_ruleNamedElement_in_rulePackage575);
lv_namedElements_3=ruleNamedElement();
_fsp--;
@@ -602,7 +602,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,14,FOLLOW_14_in_rulePackage592);
+ match(input,14,FOLLOW_14_in_rulePackage590);
createLeafNode(grammarAccess.prPackage().ele1KeywordRightCurlyBracket(), null);
@@ -629,7 +629,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleType
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:300:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
public final EObject entryRuleType() throws RecognitionException {
EObject current = null;
@@ -637,16 +637,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:46: (iv_ruleType= ruleType EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:302:2: iv_ruleType= ruleType EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:300:46: (iv_ruleType= ruleType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:2: iv_ruleType= ruleType EOF
{
currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode);
- pushFollow(FOLLOW_ruleType_in_entryRuleType627);
+ pushFollow(FOLLOW_ruleType_in_entryRuleType625);
iv_ruleType=ruleType();
_fsp--;
current =iv_ruleType;
- match(input,EOF,FOLLOW_EOF_in_entryRuleType637);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleType635);
}
@@ -664,7 +664,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleType
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:309:1: ruleType returns [EObject current=null] : (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:308:1: ruleType returns [EObject current=null] : (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) ;
public final EObject ruleType() throws RecognitionException {
EObject current = null;
@@ -676,10 +676,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:314:6: ( (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:313:6: ( (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:314:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:314:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -691,18 +691,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )", 5, 0, input);
+ new NoViableAltException("314:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )", 5, 0, input);
throw nvae;
}
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:316:5: this_Entity_0= ruleEntity
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:5: this_Entity_0= ruleEntity
{
currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode);
- pushFollow(FOLLOW_ruleEntity_in_ruleType684);
+ pushFollow(FOLLOW_ruleEntity_in_ruleType682);
this_Entity_0=ruleEntity();
_fsp--;
@@ -714,12 +714,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:326:5: this_DataType_1= ruleDataType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:325:5: this_DataType_1= ruleDataType
{
currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode);
- pushFollow(FOLLOW_ruleDataType_in_ruleType711);
+ pushFollow(FOLLOW_ruleDataType_in_ruleType709);
this_DataType_1=ruleDataType();
_fsp--;
@@ -753,7 +753,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleDataType
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:342:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
public final EObject entryRuleDataType() throws RecognitionException {
EObject current = null;
@@ -761,16 +761,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:50: (iv_ruleDataType= ruleDataType EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:344:2: iv_ruleDataType= ruleDataType EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:342:50: (iv_ruleDataType= ruleDataType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:2: iv_ruleDataType= ruleDataType EOF
{
currentNode = createCompositeNode(grammarAccess.prDataType().getRule(), currentNode);
- pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType745);
+ pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType743);
iv_ruleDataType=ruleDataType();
_fsp--;
current =iv_ruleDataType;
- match(input,EOF,FOLLOW_EOF_in_entryRuleDataType755);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDataType753);
}
@@ -788,7 +788,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleDataType
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:351:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:350:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ;
public final EObject ruleDataType() throws RecognitionException {
EObject current = null;
@@ -797,23 +797,23 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:1: ( 'datatype' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:355:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:1: ( 'datatype' (lv_name_1= RULE_ID ) )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:1: ( 'datatype' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:2: 'datatype' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:1: ( 'datatype' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:2: 'datatype' (lv_name_1= RULE_ID )
{
- match(input,15,FOLLOW_15_in_ruleDataType789);
+ match(input,15,FOLLOW_15_in_ruleDataType787);
createLeafNode(grammarAccess.prDataType().ele0KeywordDatatype(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:361:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:363:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:360:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType811);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType808);
- createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prDataType().ele10ParserRuleCallID(), "name");
if (current==null) {
@@ -853,7 +853,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEntity
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:388:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ;
public final EObject entryRuleEntity() throws RecognitionException {
EObject current = null;
@@ -861,16 +861,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:48: (iv_ruleEntity= ruleEntity EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:391:2: iv_ruleEntity= ruleEntity EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:388:48: (iv_ruleEntity= ruleEntity EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:389:2: iv_ruleEntity= ruleEntity EOF
{
currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode);
- pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity854);
+ pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity850);
iv_ruleEntity=ruleEntity();
_fsp--;
current =iv_ruleEntity;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEntity864);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEntity860);
}
@@ -888,7 +888,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEntity
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:398:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:396:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) ;
public final EObject ruleEntity() throws RecognitionException {
EObject current = null;
@@ -899,35 +899,35 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:403:6: ( ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:401:6: ( ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )*
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:5: ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:5: ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )?
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:5: ( 'entity' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:6: 'entity' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:5: ( 'entity' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:6: 'entity' (lv_name_1= RULE_ID )
{
- match(input,16,FOLLOW_16_in_ruleEntity902);
+ match(input,16,FOLLOW_16_in_ruleEntity898);
createLeafNode(grammarAccess.prEntity().ele00000KeywordEntity(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:408:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:410:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:406:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:408:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity924);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity919);
- createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prEntity().ele000010ParserRuleCallID(), "name");
if (current==null) {
@@ -947,7 +947,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:428:3: ( 'extends' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:425:3: ( 'extends' ( RULE_ID ) )?
int alt6=2;
int LA6_0 = input.LA(1);
@@ -956,14 +956,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:428:4: 'extends' ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:425:4: 'extends' ( RULE_ID )
{
- match(input,17,FOLLOW_17_in_ruleEntity943);
+ match(input,17,FOLLOW_17_in_ruleEntity937);
createLeafNode(grammarAccess.prEntity().ele00010KeywordExtends(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:429:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:3: RULE_ID
{
if (current==null) {
@@ -971,7 +971,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity965);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity959);
createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType");
@@ -987,14 +987,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,13,FOLLOW_13_in_ruleEntity980);
+ match(input,13,FOLLOW_13_in_ruleEntity974);
createLeafNode(grammarAccess.prEntity().ele001KeywordLeftCurlyBracket(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:452:2: (lv_features_5= ruleFeature )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:449:2: (lv_features_5= ruleFeature )*
loop7:
do {
int alt7=2;
@@ -1007,12 +1007,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:455:6: lv_features_5= ruleFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:452:6: lv_features_5= ruleFeature
{
currentNode=createCompositeNode(grammarAccess.prEntity().ele010ParserRuleCallFeature(), currentNode);
- pushFollow(FOLLOW_ruleFeature_in_ruleEntity1015);
+ pushFollow(FOLLOW_ruleFeature_in_ruleEntity1009);
lv_features_5=ruleFeature();
_fsp--;
@@ -1041,7 +1041,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,14,FOLLOW_14_in_ruleEntity1030);
+ match(input,14,FOLLOW_14_in_ruleEntity1024);
createLeafNode(grammarAccess.prEntity().ele1KeywordRightCurlyBracket(), null);
@@ -1068,7 +1068,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleFeature
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:483:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
public final EObject entryRuleFeature() throws RecognitionException {
EObject current = null;
@@ -1076,16 +1076,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:49: (iv_ruleFeature= ruleFeature EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:487:2: iv_ruleFeature= ruleFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:483:49: (iv_ruleFeature= ruleFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:484:2: iv_ruleFeature= ruleFeature EOF
{
currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode);
- pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1065);
+ pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1059);
iv_ruleFeature=ruleFeature();
_fsp--;
current =iv_ruleFeature;
- match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1075);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1069);
}
@@ -1103,7 +1103,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleFeature
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:494:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:491:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ;
public final EObject ruleFeature() throws RecognitionException {
EObject current = null;
@@ -1115,10 +1115,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:499:6: ( (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:496:6: ( (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:497:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:497:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -1130,18 +1130,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )", 8, 0, input);
+ new NoViableAltException("497:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )", 8, 0, input);
throw nvae;
}
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:501:5: this_StructuralFeature_0= ruleStructuralFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:498:5: this_StructuralFeature_0= ruleStructuralFeature
{
currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode);
- pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1122);
+ pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1116);
this_StructuralFeature_0=ruleStructuralFeature();
_fsp--;
@@ -1153,12 +1153,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:511:5: this_Operation_1= ruleOperation
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:508:5: this_Operation_1= ruleOperation
{
currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode);
- pushFollow(FOLLOW_ruleOperation_in_ruleFeature1149);
+ pushFollow(FOLLOW_ruleOperation_in_ruleFeature1143);
this_Operation_1=ruleOperation();
_fsp--;
@@ -1192,7 +1192,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleStructuralFeature
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:528:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:525:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ;
public final EObject entryRuleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1200,16 +1200,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:528:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:529:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:525:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:526:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
{
currentNode = createCompositeNode(grammarAccess.prStructuralFeature().getRule(), currentNode);
- pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1183);
+ pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1177);
iv_ruleStructuralFeature=ruleStructuralFeature();
_fsp--;
current =iv_ruleStructuralFeature;
- match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1193);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1187);
}
@@ -1227,7 +1227,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleStructuralFeature
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:533:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ;
public final EObject ruleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1239,10 +1239,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:541:6: ( (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:538:6: ( (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:539:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:539:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1254,18 +1254,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )", 9, 0, input);
+ new NoViableAltException("539:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )", 9, 0, input);
throw nvae;
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:543:5: this_Attribute_0= ruleAttribute
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:540:5: this_Attribute_0= ruleAttribute
{
currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode);
- pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1240);
+ pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1234);
this_Attribute_0=ruleAttribute();
_fsp--;
@@ -1277,12 +1277,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:553:5: this_Reference_1= ruleReference
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:550:5: this_Reference_1= ruleReference
{
currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode);
- pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1267);
+ pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1261);
this_Reference_1=ruleReference();
_fsp--;
@@ -1316,7 +1316,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleAttribute
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:567:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
public final EObject entryRuleAttribute() throws RecognitionException {
EObject current = null;
@@ -1324,16 +1324,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:51: (iv_ruleAttribute= ruleAttribute EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: iv_ruleAttribute= ruleAttribute EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:567:51: (iv_ruleAttribute= ruleAttribute EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:568:2: iv_ruleAttribute= ruleAttribute EOF
{
currentNode = createCompositeNode(grammarAccess.prAttribute().getRule(), currentNode);
- pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1301);
+ pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1295);
iv_ruleAttribute=ruleAttribute();
_fsp--;
current =iv_ruleAttribute;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1311);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1305);
}
@@ -1351,7 +1351,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleAttribute
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:578:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:575:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ;
public final EObject ruleAttribute() throws RecognitionException {
EObject current = null;
@@ -1362,29 +1362,29 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:583:6: ( ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:580:6: ( ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:3: ( 'attr' (lv_name_1= RULE_ID ) ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:3: ( 'attr' (lv_name_1= RULE_ID ) ) ':'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:3: ( 'attr' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:4: 'attr' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:3: ( 'attr' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:4: 'attr' (lv_name_1= RULE_ID )
{
- match(input,18,FOLLOW_18_in_ruleAttribute1347);
+ match(input,18,FOLLOW_18_in_ruleAttribute1341);
createLeafNode(grammarAccess.prAttribute().ele000KeywordAttr(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:588:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:590:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:585:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:587:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1369);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1362);
- createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prAttribute().ele0010ParserRuleCallID(), "name");
if (current==null) {
@@ -1404,20 +1404,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,19,FOLLOW_19_in_ruleAttribute1387);
+ match(input,19,FOLLOW_19_in_ruleAttribute1379);
createLeafNode(grammarAccess.prAttribute().ele01KeywordColon(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:612:2: (lv_type_3= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:615:6: lv_type_3= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:608:2: (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:611:6: lv_type_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prAttribute().ele10ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1422);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1414);
lv_type_3=ruleTypeRef();
_fsp--;
@@ -1460,7 +1460,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleReference
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:638:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
public final EObject entryRuleReference() throws RecognitionException {
EObject current = null;
@@ -1468,16 +1468,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:51: (iv_ruleReference= ruleReference EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:643:2: iv_ruleReference= ruleReference EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:638:51: (iv_ruleReference= ruleReference EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:639:2: iv_ruleReference= ruleReference EOF
{
currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode);
- pushFollow(FOLLOW_ruleReference_in_entryRuleReference1461);
+ pushFollow(FOLLOW_ruleReference_in_entryRuleReference1453);
iv_ruleReference=ruleReference();
_fsp--;
current =iv_ruleReference;
- match(input,EOF,FOLLOW_EOF_in_entryRuleReference1471);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleReference1463);
}
@@ -1495,7 +1495,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleReference
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:650:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:646:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) ;
public final EObject ruleReference() throws RecognitionException {
EObject current = null;
@@ -1506,32 +1506,32 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:655:6: ( ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:651:6: ( ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )?
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:4: ( 'ref' (lv_name_1= RULE_ID ) ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:4: ( 'ref' (lv_name_1= RULE_ID ) ) ':'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:4: ( 'ref' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:5: 'ref' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:4: ( 'ref' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:5: 'ref' (lv_name_1= RULE_ID )
{
- match(input,20,FOLLOW_20_in_ruleReference1508);
+ match(input,20,FOLLOW_20_in_ruleReference1500);
createLeafNode(grammarAccess.prReference().ele0000KeywordRef(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:660:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:662:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:658:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1530);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1521);
- createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prReference().ele00010ParserRuleCallID(), "name");
if (current==null) {
@@ -1551,20 +1551,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,19,FOLLOW_19_in_ruleReference1548);
+ match(input,19,FOLLOW_19_in_ruleReference1538);
createLeafNode(grammarAccess.prReference().ele001KeywordColon(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:684:2: (lv_type_3= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:687:6: lv_type_3= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:679:2: (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:682:6: lv_type_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prReference().ele010ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1583);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1573);
lv_type_3=ruleTypeRef();
_fsp--;
@@ -1587,7 +1587,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:3: ( 'opposite' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:700:3: ( 'opposite' ( RULE_ID ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1596,14 +1596,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:4: 'opposite' ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:700:4: 'opposite' ( RULE_ID )
{
- match(input,21,FOLLOW_21_in_ruleReference1598);
+ match(input,21,FOLLOW_21_in_ruleReference1588);
createLeafNode(grammarAccess.prReference().ele10KeywordOpposite(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:709:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:712:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:704:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:707:3: RULE_ID
{
if (current==null) {
@@ -1611,7 +1611,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1620);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1610);
createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite");
@@ -1647,7 +1647,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleOperation
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:729:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ;
public final EObject entryRuleOperation() throws RecognitionException {
EObject current = null;
@@ -1655,16 +1655,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:51: (iv_ruleOperation= ruleOperation EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:735:2: iv_ruleOperation= ruleOperation EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:729:51: (iv_ruleOperation= ruleOperation EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:730:2: iv_ruleOperation= ruleOperation EOF
{
currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode);
- pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1660);
+ pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1650);
iv_ruleOperation=ruleOperation();
_fsp--;
current =iv_ruleOperation;
- match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1670);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1660);
}
@@ -1682,7 +1682,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleOperation
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:742:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:737:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) ;
public final EObject ruleOperation() throws RecognitionException {
EObject current = null;
@@ -1697,38 +1697,38 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:747:6: ( ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:742:6: ( ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:6: ( 'op' (lv_name_1= RULE_ID ) ) '('
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:6: ( 'op' (lv_name_1= RULE_ID ) ) '('
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:6: ( 'op' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:7: 'op' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:6: ( 'op' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:7: 'op' (lv_name_1= RULE_ID )
{
- match(input,22,FOLLOW_22_in_ruleOperation1709);
+ match(input,22,FOLLOW_22_in_ruleOperation1699);
createLeafNode(grammarAccess.prOperation().ele000000KeywordOp(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:752:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:754:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:747:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:749:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1731);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1720);
- createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prOperation().ele0000010ParserRuleCallID(), "name");
if (current==null) {
@@ -1748,14 +1748,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,23,FOLLOW_23_in_ruleOperation1749);
+ match(input,23,FOLLOW_23_in_ruleOperation1737);
createLeafNode(grammarAccess.prOperation().ele00001KeywordLeftParenthesis(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:2: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:770:2: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1764,15 +1764,15 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:3: (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:770:3: (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )*
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:3: (lv_params_3= ruleParameter )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:779:6: lv_params_3= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:770:3: (lv_params_3= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:773:6: lv_params_3= ruleParameter
{
currentNode=createCompositeNode(grammarAccess.prOperation().ele000100ParserRuleCallParameter(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_ruleOperation1785);
+ pushFollow(FOLLOW_ruleParameter_in_ruleOperation1773);
lv_params_3=ruleParameter();
_fsp--;
@@ -1792,7 +1792,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:797:2: ( ',' (lv_params_5= ruleParameter ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:791:2: ( ',' (lv_params_5= ruleParameter ) )*
loop11:
do {
int alt11=2;
@@ -1805,19 +1805,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:797:3: ',' (lv_params_5= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:791:3: ',' (lv_params_5= ruleParameter )
{
- match(input,24,FOLLOW_24_in_ruleOperation1799);
+ match(input,24,FOLLOW_24_in_ruleOperation1787);
createLeafNode(grammarAccess.prOperation().ele000110KeywordComma(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:801:1: (lv_params_5= ruleParameter )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:804:6: lv_params_5= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:795:1: (lv_params_5= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:798:6: lv_params_5= ruleParameter
{
currentNode=createCompositeNode(grammarAccess.prOperation().ele0001110ParserRuleCallParameter(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_ruleOperation1833);
+ pushFollow(FOLLOW_ruleParameter_in_ruleOperation1821);
lv_params_5=ruleParameter();
_fsp--;
@@ -1855,27 +1855,27 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,25,FOLLOW_25_in_ruleOperation1851);
+ match(input,25,FOLLOW_25_in_ruleOperation1839);
createLeafNode(grammarAccess.prOperation().ele001KeywordRightParenthesis(), null);
}
- match(input,19,FOLLOW_19_in_ruleOperation1861);
+ match(input,19,FOLLOW_19_in_ruleOperation1849);
createLeafNode(grammarAccess.prOperation().ele01KeywordColon(), null);
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:830:2: (lv_type_8= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:833:6: lv_type_8= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:824:2: (lv_type_8= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:827:6: lv_type_8= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prOperation().ele10ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1896);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1884);
lv_type_8=ruleTypeRef();
_fsp--;
@@ -1918,7 +1918,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleParameter
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:860:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:854:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
public final EObject entryRuleParameter() throws RecognitionException {
EObject current = null;
@@ -1926,16 +1926,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:860:51: (iv_ruleParameter= ruleParameter EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:861:2: iv_ruleParameter= ruleParameter EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:854:51: (iv_ruleParameter= ruleParameter EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:855:2: iv_ruleParameter= ruleParameter EOF
{
currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1935);
+ pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1923);
iv_ruleParameter=ruleParameter();
_fsp--;
current =iv_ruleParameter;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1945);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1933);
}
@@ -1953,7 +1953,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleParameter
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:1: ruleParameter returns [EObject current=null] : ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:862:1: ruleParameter returns [EObject current=null] : ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ;
public final EObject ruleParameter() throws RecognitionException {
EObject current = null;
@@ -1964,19 +1964,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:873:6: ( ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:867:6: ( ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:2: (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:2: (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:2: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:876:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:2: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:870:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1992);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1979);
- createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name");
+ createLeafNode(grammarAccess.prParameter().ele00ParserRuleCallID(), "name");
if (current==null) {
@@ -1993,13 +1993,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:894:2: (lv_type_1= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:897:6: lv_type_1= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:887:2: (lv_type_1= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:890:6: lv_type_1= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2034);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2020);
lv_type_1=ruleTypeRef();
_fsp--;
@@ -2042,7 +2042,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleTypeRef
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:926:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:919:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
public final EObject entryRuleTypeRef() throws RecognitionException {
EObject current = null;
@@ -2050,16 +2050,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:926:49: (iv_ruleTypeRef= ruleTypeRef EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:927:2: iv_ruleTypeRef= ruleTypeRef EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:919:49: (iv_ruleTypeRef= ruleTypeRef EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:920:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2075);
+ pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2061);
iv_ruleTypeRef=ruleTypeRef();
_fsp--;
current =iv_ruleTypeRef;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2085);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2071);
}
@@ -2077,18 +2077,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleTypeRef
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:934:1: ruleTypeRef returns [EObject current=null] : ( RULE_ID ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:927:1: ruleTypeRef returns [EObject current=null] : ( RULE_ID ) ;
public final EObject ruleTypeRef() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:939:6: ( ( RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:940:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:6: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:933:1: ( RULE_ID )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:940:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:943:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:933:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:936:3: RULE_ID
{
if (current==null) {
@@ -2096,7 +2096,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2131);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2117);
createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced");
@@ -2123,7 +2123,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleQualifiedName
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:965:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
public final String entryRuleQualifiedName() throws RecognitionException {
String current = null;
@@ -2131,16 +2131,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:965:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:2: iv_ruleQualifiedName= ruleQualifiedName EOF
{
currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode);
- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2169);
+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2155);
iv_ruleQualifiedName=ruleQualifiedName();
_fsp--;
current =iv_ruleQualifiedName.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2180);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2166);
}
@@ -2158,7 +2158,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleQualifiedName
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:973:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -2169,21 +2169,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:979:6: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:972:6: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:973:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:973:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:973: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_ruleQualifiedName2220);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2206);
current.merge(this_ID_0);
- createLeafNode(grammarAccess.prQualifiedName().ele0LexerRuleCallID(), null);
+ createLeafNode(grammarAccess.prQualifiedName().ele0ParserRuleCallID(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:987:1: (kw= '.' this_ID_2= RULE_ID )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (kw= '.' this_ID_2= RULE_ID )*
loop13:
do {
int alt13=2;
@@ -2196,21 +2196,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt13) {
case 1 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:988:2: kw= '.' this_ID_2= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:981:2: kw= '.' this_ID_2= RULE_ID
{
kw=(Token)input.LT(1);
- match(input,26,FOLLOW_26_in_ruleQualifiedName2239);
+ match(input,26,FOLLOW_26_in_ruleQualifiedName2225);
current.merge(kw);
createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null);
this_ID_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2254);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2240);
current.merge(this_ID_2);
- createLeafNode(grammarAccess.prQualifiedName().ele11LexerRuleCallID(), null);
+ createLeafNode(grammarAccess.prQualifiedName().ele11ParserRuleCallID(), null);
}
@@ -2253,79 +2253,79 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_ruleImport_in_entryRuleImport220 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleImport230 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_11_in_ruleImport264 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleImport286 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement329 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement339 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement386 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleType_in_ruleNamedElement413 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rulePackage_in_entryRulePackage447 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRulePackage457 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_12_in_rulePackage494 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage528 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_13_in_rulePackage542 = new BitSet(new long[]{0x000000000001D000L});
- public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage577 = new BitSet(new long[]{0x000000000001D000L});
- public static final BitSet FOLLOW_14_in_rulePackage592 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleType_in_entryRuleType627 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleType637 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEntity_in_ruleType684 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDataType_in_ruleType711 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType745 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDataType755 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_ruleDataType789 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleDataType811 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity854 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEntity864 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_ruleEntity902 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEntity924 = new BitSet(new long[]{0x0000000000022000L});
- public static final BitSet FOLLOW_17_in_ruleEntity943 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEntity965 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_13_in_ruleEntity980 = new BitSet(new long[]{0x0000000000544000L});
- public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1015 = new BitSet(new long[]{0x0000000000544000L});
- public static final BitSet FOLLOW_14_in_ruleEntity1030 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1065 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFeature1075 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1122 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1149 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1183 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1193 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1240 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1267 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1301 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1311 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_ruleAttribute1347 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1369 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleAttribute1387 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1422 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1461 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleReference1471 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_ruleReference1508 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleReference1530 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleReference1548 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1583 = new BitSet(new long[]{0x0000000000200002L});
- public static final BitSet FOLLOW_21_in_ruleReference1598 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleReference1620 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1660 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleOperation1670 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_22_in_ruleOperation1709 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1731 = new BitSet(new long[]{0x0000000000800000L});
- public static final BitSet FOLLOW_23_in_ruleOperation1749 = new BitSet(new long[]{0x0000000002000020L});
- public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1785 = new BitSet(new long[]{0x0000000003000000L});
- public static final BitSet FOLLOW_24_in_ruleOperation1799 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1833 = new BitSet(new long[]{0x0000000003000000L});
- public static final BitSet FOLLOW_25_in_ruleOperation1851 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleOperation1861 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1896 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1935 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParameter1945 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1992 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2034 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2075 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2085 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2131 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2169 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2180 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2220 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_26_in_ruleQualifiedName2239 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2254 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleImport285 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement327 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement337 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement384 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleType_in_ruleNamedElement411 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rulePackage_in_entryRulePackage445 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRulePackage455 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_12_in_rulePackage492 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage526 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_13_in_rulePackage540 = new BitSet(new long[]{0x000000000001D000L});
+ public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage575 = new BitSet(new long[]{0x000000000001D000L});
+ public static final BitSet FOLLOW_14_in_rulePackage590 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleType_in_entryRuleType625 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleType635 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEntity_in_ruleType682 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDataType_in_ruleType709 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType743 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDataType753 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleDataType787 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleDataType808 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity850 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEntity860 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_16_in_ruleEntity898 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEntity919 = new BitSet(new long[]{0x0000000000022000L});
+ public static final BitSet FOLLOW_17_in_ruleEntity937 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEntity959 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_13_in_ruleEntity974 = new BitSet(new long[]{0x0000000000544000L});
+ public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1009 = new BitSet(new long[]{0x0000000000544000L});
+ public static final BitSet FOLLOW_14_in_ruleEntity1024 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1059 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFeature1069 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1116 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1143 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1177 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1187 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1234 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1261 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1295 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1305 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleAttribute1341 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1362 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleAttribute1379 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1414 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1453 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleReference1463 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_20_in_ruleReference1500 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReference1521 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleReference1538 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1573 = new BitSet(new long[]{0x0000000000200002L});
+ public static final BitSet FOLLOW_21_in_ruleReference1588 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReference1610 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1650 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleOperation1660 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_22_in_ruleOperation1699 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1720 = new BitSet(new long[]{0x0000000000800000L});
+ public static final BitSet FOLLOW_23_in_ruleOperation1737 = new BitSet(new long[]{0x0000000002000020L});
+ public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1773 = new BitSet(new long[]{0x0000000003000000L});
+ public static final BitSet FOLLOW_24_in_ruleOperation1787 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1821 = new BitSet(new long[]{0x0000000003000000L});
+ public static final BitSet FOLLOW_25_in_ruleOperation1839 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleOperation1849 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1884 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1923 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParameter1933 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1979 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2020 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2061 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2071 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2117 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2155 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2166 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2206 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_26_in_ruleQualifiedName2225 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2240 = new BitSet(new long[]{0x0000000004000002L});
} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
index 6f366f5..097b771 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
@@ -24,28 +24,39 @@ T24 : ',' ;
T25 : ')' ;
T26 : '.' ;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1041
-RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1052
+RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*;
+
+
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1043
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1056
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1045
-RULE_STRING :
- '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |
- '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''
- ;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1050
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/';
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1052
-RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?;
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1060
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1054
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1056
+
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1064
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+
+
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1068
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+
+
+
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1072
+RULE_WS : (((' '|'\t')|'\r')|'\n')+;
+
+
+
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1076
RULE_ANY_OTHER : .;
+
+
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 a345b00..72a36d6 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
@@ -8,7 +8,7 @@ import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
-import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration;
+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;
@@ -26,17 +26,17 @@ import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelParameterCo
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypedElementConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeRefConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelQualifiedNameConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinINTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinML_COMMENTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENTConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer;
-import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSTRINGConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsML_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSL_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsWSConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsumer;
public class DomainmodelParserConfiguration extends AbstractParserConfiguration {
- private final XtextBuiltinParserConfiguration xtextBuiltinConfiguration;
+ private final TerminalsParserConfiguration terminalsConfiguration;
private DomainmodelFileConsumer fileConsumer;
private DomainmodelImportConsumer importConsumer;
@@ -60,7 +60,7 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
public DomainmodelParserConfiguration(IInternalParserConfiguration configuration, DomainmodelGrammarAccess grammarAccess) {
super(configuration);
this.grammarAccess = grammarAccess;
- this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration, null);
+ this.terminalsConfiguration = new TerminalsParserConfiguration(configuration, null);
}
public DomainmodelFileConsumer getRootConsumer() {
@@ -68,7 +68,7 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
}
public void createNonTerminalConsumers() {
- getXtextBuiltinConfiguration().createNonTerminalConsumers();
+ getTerminalsConfiguration().createNonTerminalConsumers();
fileConsumer = new DomainmodelFileConsumer(
this, null
);
@@ -120,7 +120,7 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
}
public void createTerminalConsumers() {
- getXtextBuiltinConfiguration().createTerminalConsumers();
+ getTerminalsConfiguration().createTerminalConsumers();
}
public void configureConsumers() {
@@ -142,13 +142,13 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
getTypedElementConsumer().setRule(grammarAccess.prTypedElement());
getTypeRefConsumer().setRule(grammarAccess.prTypeRef());
getQualifiedNameConsumer().setRule(grammarAccess.prQualifiedName());
- getIdConsumer().setRule(grammarAccess.lrID());
- getIntConsumer().setRule(grammarAccess.lrINT());
- getStringConsumer().setRule(grammarAccess.lrSTRING());
- getMlCommentConsumer().setRule(grammarAccess.lrML_COMMENT());
- getSlCommentConsumer().setRule(grammarAccess.lrSL_COMMENT());
- getWsConsumer().setRule(grammarAccess.lrWS());
- getAnyOtherConsumer().setRule(grammarAccess.lrANY_OTHER());
+ getIdConsumer().setRule(grammarAccess.prID());
+ getIntConsumer().setRule(grammarAccess.prINT());
+ getStringConsumer().setRule(grammarAccess.prSTRING());
+ getMlCommentConsumer().setRule(grammarAccess.prML_COMMENT());
+ getSlCommentConsumer().setRule(grammarAccess.prSL_COMMENT());
+ getWsConsumer().setRule(grammarAccess.prWS());
+ getAnyOtherConsumer().setRule(grammarAccess.prANY_OTHER());
getFileConsumer().setImportConsumer(getImportConsumer());
@@ -231,8 +231,8 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
}
// TODO collect superGrammars transitive
- public XtextBuiltinParserConfiguration getXtextBuiltinConfiguration() {
- return xtextBuiltinConfiguration;
+ public TerminalsParserConfiguration getTerminalsConfiguration() {
+ return terminalsConfiguration;
}
public DomainmodelFileConsumer getFileConsumer() {
@@ -299,38 +299,38 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
return qualifiedNameConsumer;
}
- public XtextBuiltinIDConsumer getIdConsumer() {
- return getXtextBuiltinConfiguration().getIdConsumer();
+ public TerminalsIDConsumer getIdConsumer() {
+ return getTerminalsConfiguration().getIdConsumer();
}
- public XtextBuiltinINTConsumer getIntConsumer() {
- return getXtextBuiltinConfiguration().getIntConsumer();
+ public TerminalsINTConsumer getIntConsumer() {
+ return getTerminalsConfiguration().getIntConsumer();
}
- public XtextBuiltinSTRINGConsumer getStringConsumer() {
- return getXtextBuiltinConfiguration().getStringConsumer();
+ public TerminalsSTRINGConsumer getStringConsumer() {
+ return getTerminalsConfiguration().getStringConsumer();
}
- public XtextBuiltinML_COMMENTConsumer getMlCommentConsumer() {
- return getXtextBuiltinConfiguration().getMlCommentConsumer();
+ public TerminalsML_COMMENTConsumer getMlCommentConsumer() {
+ return getTerminalsConfiguration().getMlCommentConsumer();
}
- public XtextBuiltinSL_COMMENTConsumer getSlCommentConsumer() {
- return getXtextBuiltinConfiguration().getSlCommentConsumer();
+ public TerminalsSL_COMMENTConsumer getSlCommentConsumer() {
+ return getTerminalsConfiguration().getSlCommentConsumer();
}
- public XtextBuiltinWSConsumer getWsConsumer() {
- return getXtextBuiltinConfiguration().getWsConsumer();
+ public TerminalsWSConsumer getWsConsumer() {
+ return getTerminalsConfiguration().getWsConsumer();
}
- public XtextBuiltinANY_OTHERConsumer getAnyOtherConsumer() {
- return getXtextBuiltinConfiguration().getAnyOtherConsumer();
+ public TerminalsANY_OTHERConsumer getAnyOtherConsumer() {
+ return getTerminalsConfiguration().getAnyOtherConsumer();
}
@Override
public ITerminalConsumer[] getInitialHiddenTerminals() {
- return getXtextBuiltinConfiguration().getInitialHiddenTerminals();
+ return getTerminalsConfiguration().getInitialHiddenTerminals();
}
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index 6475ec4..bab674d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -158,7 +158,7 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$4$Consumer = new Keyword$4$Consumer(rule.ele000KeywordAttr());
assignment$5$Consumer = new Assignment$5$Consumer(rule.ele001AssignmentName());
- ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.ele0010LexerRuleCallID());
+ ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.ele0010ParserRuleCallID());
keyword$7$Consumer = new Keyword$7$Consumer(rule.ele01KeywordColon());
assignment$8$Consumer = new Assignment$8$Consumer(rule.ele1AssignmentType());
ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele10ParserRuleCallTypeRef());
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index fe7cb37..957382f 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -108,7 +108,7 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordDatatype());
assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
- ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10LexerRuleCallID());
+ ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallID());
}
@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index d77a0b3..47b15c3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -241,7 +241,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$6$Consumer = new Keyword$6$Consumer(rule.ele00000KeywordEntity());
assignment$7$Consumer = new Assignment$7$Consumer(rule.ele00001AssignmentName());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010LexerRuleCallID());
+ ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010ParserRuleCallID());
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.ele00011AssignmentSuperType());
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
index dbe2fc9..e6cabcd 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
@@ -108,7 +108,7 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordImport());
assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentImportURI());
- ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10LexerRuleCallSTRING());
+ ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallSTRING());
}
@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
index e44a505..1070860 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
@@ -300,7 +300,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$7$Consumer = new Keyword$7$Consumer(rule.ele000000KeywordOp());
assignment$8$Consumer = new Assignment$8$Consumer(rule.ele000001AssignmentName());
- ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele0000010LexerRuleCallID());
+ ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele0000010ParserRuleCallID());
keyword$10$Consumer = new Keyword$10$Consumer(rule.ele00001KeywordLeftParenthesis());
group$11$Consumer = new Group$11$Consumer(rule.ele0001Group());
assignment$12$Consumer = new Assignment$12$Consumer(rule.ele00010AssignmentParams());
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
index 7e75621..e8e864c 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
@@ -119,7 +119,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
assignment$2$Consumer = new Assignment$2$Consumer(rule.ele0AssignmentName());
- ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele00LexerRuleCallID());
+ ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele00ParserRuleCallID());
assignment$4$Consumer = new Assignment$4$Consumer(rule.ele1AssignmentType());
ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele10ParserRuleCallTypeRef());
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
index f8aaa12..0bdc49b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
@@ -123,10 +123,10 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
this.rule = rule;
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
- ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0LexerRuleCallID());
+ ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallID());
group$3$Consumer = new Group$3$Consumer(rule.ele1Group());
keyword$4$Consumer = new Keyword$4$Consumer(rule.ele10KeywordFullStop());
- ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele11LexerRuleCallID());
+ ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele11ParserRuleCallID());
}
@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index b8bdd53..cdd269b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -223,7 +223,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordRef());
assignment$6$Consumer = new Assignment$6$Consumer(rule.ele0001AssignmentName());
- ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele00010LexerRuleCallID());
+ ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele00010ParserRuleCallID());
keyword$8$Consumer = new Keyword$8$Consumer(rule.ele001KeywordColon());
assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentType());
ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallTypeRef());
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 c119fcf..ec3dca59 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
@@ -11,7 +11,7 @@ import org.eclipse.xtext.*;
import org.eclipse.xtext.service.GrammarProvider;
-import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
@Singleton
public class DomainmodelGrammarAccess implements IGrammarAccess {
@@ -49,7 +49,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword c0KeywordImport = (Keyword)cGroup.eContents().get(0);
private final Assignment c1AssignmentImportURI = (Assignment)cGroup.eContents().get(1);
- private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0);
+ private final RuleCall c10ParserRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0);
// not supported
public ParserRule getRule() { return rule; }
@@ -64,7 +64,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele1AssignmentImportURI() { return c1AssignmentImportURI; }
// not supported
- public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
+ public RuleCall ele10ParserRuleCallSTRING() { return c10ParserRuleCallSTRING; }
}
public class NamedElementElements implements IParserRuleAccess {
@@ -161,7 +161,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword c0KeywordDatatype = (Keyword)cGroup.eContents().get(0);
private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
- private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
+ private final RuleCall c10ParserRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
// not supported
public ParserRule getRule() { return rule; }
@@ -176,7 +176,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele1AssignmentName() { return c1AssignmentName; }
// not supported
- public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
+ public RuleCall ele10ParserRuleCallID() { return c10ParserRuleCallID; }
}
public class EntityElements implements IParserRuleAccess {
@@ -188,7 +188,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group c0000Group = (Group)c000Group.eContents().get(0);
private final Keyword c00000KeywordEntity = (Keyword)c0000Group.eContents().get(0);
private final Assignment c00001AssignmentName = (Assignment)c0000Group.eContents().get(1);
- private final RuleCall c000010LexerRuleCallID = (RuleCall)c00001AssignmentName.eContents().get(0);
+ private final RuleCall c000010ParserRuleCallID = (RuleCall)c00001AssignmentName.eContents().get(0);
private final Group c0001Group = (Group)c000Group.eContents().get(1);
private final Keyword c00010KeywordExtends = (Keyword)c0001Group.eContents().get(0);
private final Assignment c00011AssignmentSuperType = (Assignment)c0001Group.eContents().get(1);
@@ -223,7 +223,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele00001AssignmentName() { return c00001AssignmentName; }
// not supported
- public RuleCall ele000010LexerRuleCallID() { return c000010LexerRuleCallID; }
+ public RuleCall ele000010ParserRuleCallID() { return c000010ParserRuleCallID; }
// not supported
public Group ele0001Group() { return c0001Group; }
@@ -295,7 +295,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group c00Group = (Group)c0Group.eContents().get(0);
private final Keyword c000KeywordAttr = (Keyword)c00Group.eContents().get(0);
private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
- private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+ private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
private final Keyword c01KeywordColon = (Keyword)c0Group.eContents().get(1);
private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0);
@@ -319,7 +319,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele001AssignmentName() { return c001AssignmentName; }
// not supported
- public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
+ public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; }
// not supported
public Keyword ele01KeywordColon() { return c01KeywordColon; }
@@ -339,7 +339,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group c000Group = (Group)c00Group.eContents().get(0);
private final Keyword c0000KeywordRef = (Keyword)c000Group.eContents().get(0);
private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1);
- private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
+ private final RuleCall c00010ParserRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
private final Keyword c001KeywordColon = (Keyword)c00Group.eContents().get(1);
private final Assignment c01AssignmentType = (Assignment)c0Group.eContents().get(1);
private final RuleCall c010ParserRuleCallTypeRef = (RuleCall)c01AssignmentType.eContents().get(0);
@@ -370,7 +370,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele0001AssignmentName() { return c0001AssignmentName; }
// not supported
- public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
+ public RuleCall ele00010ParserRuleCallID() { return c00010ParserRuleCallID; }
// not supported
public Keyword ele001KeywordColon() { return c001KeywordColon; }
@@ -404,7 +404,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final Group c00000Group = (Group)c0000Group.eContents().get(0);
private final Keyword c000000KeywordOp = (Keyword)c00000Group.eContents().get(0);
private final Assignment c000001AssignmentName = (Assignment)c00000Group.eContents().get(1);
- private final RuleCall c0000010LexerRuleCallID = (RuleCall)c000001AssignmentName.eContents().get(0);
+ private final RuleCall c0000010ParserRuleCallID = (RuleCall)c000001AssignmentName.eContents().get(0);
private final Keyword c00001KeywordLeftParenthesis = (Keyword)c0000Group.eContents().get(1);
private final Group c0001Group = (Group)c000Group.eContents().get(1);
private final Assignment c00010AssignmentParams = (Assignment)c0001Group.eContents().get(0);
@@ -446,7 +446,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele000001AssignmentName() { return c000001AssignmentName; }
// not supported
- public RuleCall ele0000010LexerRuleCallID() { return c0000010LexerRuleCallID; }
+ public RuleCall ele0000010ParserRuleCallID() { return c0000010ParserRuleCallID; }
// not supported
public Keyword ele00001KeywordLeftParenthesis() { return c00001KeywordLeftParenthesis; }
@@ -489,7 +489,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Parameter");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
- private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+ private final RuleCall c00ParserRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0);
@@ -503,7 +503,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Assignment ele0AssignmentName() { return c0AssignmentName; }
// not supported
- public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
+ public RuleCall ele00ParserRuleCallID() { return c00ParserRuleCallID; }
// not supported
public Assignment ele1AssignmentType() { return c1AssignmentType; }
@@ -549,10 +549,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public class QualifiedNameElements implements IParserRuleAccess {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedName");
private final Group cGroup = (Group)rule.eContents().get(1);
- private final RuleCall c0LexerRuleCallID = (RuleCall)cGroup.eContents().get(0);
+ private final RuleCall c0ParserRuleCallID = (RuleCall)cGroup.eContents().get(0);
private final Group c1Group = (Group)cGroup.eContents().get(1);
private final Keyword c10KeywordFullStop = (Keyword)c1Group.eContents().get(0);
- private final RuleCall c11LexerRuleCallID = (RuleCall)c1Group.eContents().get(1);
+ private final RuleCall c11ParserRuleCallID = (RuleCall)c1Group.eContents().get(1);
// not supported
public ParserRule getRule() { return rule; }
@@ -561,7 +561,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Group eleGroup() { return cGroup; }
// not supported
- public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
+ public RuleCall ele0ParserRuleCallID() { return c0ParserRuleCallID; }
// not supported
public Group ele1Group() { return c1Group; }
@@ -570,7 +570,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public Keyword ele10KeywordFullStop() { return c10KeywordFullStop; }
// not supported
- public RuleCall ele11LexerRuleCallID() { return c11LexerRuleCallID; }
+ public RuleCall ele11ParserRuleCallID() { return c11ParserRuleCallID; }
}
private FileElements pFile;
@@ -592,10 +592,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
private final GrammarProvider grammarProvider;
- private XtextBuiltinGrammarAccess superGrammarAccess;
+ private TerminalsGrammarAccess superGrammarAccess;
@Inject
- public DomainmodelGrammarAccess(GrammarProvider grammarProvider, XtextBuiltinGrammarAccess superGrammarAccess) {
+ public DomainmodelGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess superGrammarAccess) {
this.grammarProvider = grammarProvider;
this.superGrammarAccess = superGrammarAccess;
}
@@ -605,7 +605,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
}
- public XtextBuiltinGrammarAccess getSuperGrammarAccess() {
+ public TerminalsGrammarAccess getSuperGrammarAccess() {
return superGrammarAccess;
}
@@ -691,37 +691,37 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
}
// not supported
- public LexerRule lrID() {
- return superGrammarAccess.lrID();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.IDElements prID() {
+ return superGrammarAccess.prID();
}
// not supported
- public LexerRule lrINT() {
- return superGrammarAccess.lrINT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.INTElements prINT() {
+ return superGrammarAccess.prINT();
}
// not supported
- public LexerRule lrSTRING() {
- return superGrammarAccess.lrSTRING();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.STRINGElements prSTRING() {
+ return superGrammarAccess.prSTRING();
}
// not supported
- public LexerRule lrML_COMMENT() {
- return superGrammarAccess.lrML_COMMENT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ML_COMMENTElements prML_COMMENT() {
+ return superGrammarAccess.prML_COMMENT();
}
// not supported
- public LexerRule lrSL_COMMENT() {
- return superGrammarAccess.lrSL_COMMENT();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.SL_COMMENTElements prSL_COMMENT() {
+ return superGrammarAccess.prSL_COMMENT();
}
// not supported
- public LexerRule lrWS() {
- return superGrammarAccess.lrWS();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.WSElements prWS() {
+ return superGrammarAccess.prWS();
}
// not supported
- public LexerRule lrANY_OTHER() {
- return superGrammarAccess.lrANY_OTHER();
+ public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ANY_OTHERElements prANY_OTHER() {
+ return superGrammarAccess.prANY_OTHER();
}
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
index 8db0fae..b7adfe3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
@@ -17,7 +17,7 @@ public abstract class AbstractEcoreDslUiModule extends DefaultUIModule {
}
public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
- return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.BuiltinAntlrTokenColorer.class;
+ return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
}
public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java
index 67bdd0d..0d479e4 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java
@@ -989,6 +989,13 @@ public class GenEcoreDslProposals extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
+
+
+
+
+
+
+
@Override
protected String getDefaultImageFilePath() {
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 b64098c..a5af4fd 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
@@ -850,44 +850,197 @@
</alternatives>
</rules>
</xtext:Grammar>
- <xtext:Grammar name="org.eclipse.xtext.builtin.XtextBuiltin" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
+ <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
<metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
<ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
</metamodelDeclarations>
- <rules xsi:type="xtext:LexerRule" name="ID" body="('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*">
+ <rules xsi:type="xtext:ParserRule" name="ID" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="^"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="a"/>
+ <right value="z"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="A"/>
+ <right value="Z"/>
+ </groups>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="_"/>
+ </groups>
+ <groups xsi:type="xtext:CharacterRange">
+ <left value="0"/>
+ <right value="9"/>
+ </groups>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="INT" body="('0'..'9')+">
+ <rules xsi:type="xtext:ParserRule" name="INT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</type>
+ <alternatives xsi:type="xtext:CharacterRange" cardinality="+">
+ <left value="0"/>
+ <right value="9"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="STRING" body="&#xA;&#x9;&#x9;&#x9; '&quot;' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'&quot;') )* '&quot;' | &#xA; '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\&quot;'|'\''|'\\') | ~('\\'|'\'') )* '\''&#xA; ">
+ <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+ <groups xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
+ <abstractTokens xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="b"/>
+ <groups xsi:type="xtext:Keyword" value="t"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="n"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="f"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="r"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&quot;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ </abstractTokens>
+ </groups>
+ <groups xsi:type="xtext:NegatedToken">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="\"/>
+ <groups xsi:type="xtext:Keyword" value="'"/>
+ </terminal>
+ </groups>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Keyword" value="'"/>
+ </groups>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ML_COMMENT" body="'/*' ( options {greedy=false;} : . )* '*/'">
+ <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="/*"/>
+ <abstractTokens xsi:type="xtext:UpToToken">
+ <terminal xsi:type="xtext:Keyword" value="*/"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="SL_COMMENT" body="'//' ~('\n'|'\r')* ('\r'? '\n')?">
+ <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Keyword" value="//"/>
+ <abstractTokens xsi:type="xtext:NegatedToken" cardinality="*">
+ <terminal xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </terminal>
+ </abstractTokens>
+ </abstractTokens>
+ <abstractTokens xsi:type="xtext:Group" cardinality="?">
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="&#xA;"/>
+ </abstractTokens>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="WS" body="(' '|'\t'|'\r'|'\n')+">
+ <rules xsi:type="xtext:ParserRule" name="WS" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Alternatives" cardinality="+">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Alternatives">
+ <groups xsi:type="xtext:Keyword" value=" "/>
+ <groups xsi:type="xtext:Keyword" value="&#x9;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+ </groups>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ </alternatives>
</rules>
- <rules xsi:type="xtext:LexerRule" name="ANY_OTHER" body=".">
+ <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true">
<type metamodel="/1/@metamodelDeclarations.0">
<type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
+ <alternatives xsi:type="xtext:Wildcard" isWildcard="true"/>
</rules>
</xtext:Grammar>
</xmi:XMI>
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 d7ee119..36c6d62 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
@@ -1,4 +1,3 @@
-
package org.eclipse.xtext.example;
import org.eclipse.emf.ecore.EPackage;
@@ -21,7 +20,7 @@ public class EcoreDslStandaloneSetup implements ISetup {
public Injector createInjectorAndDoEMFRegistration() {
- org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup.doSetup();
+ org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
Injector injector = createInjector();
register(injector);
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
index 8169eb7..91d793e 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
@@ -309,11 +309,13 @@ protected class ImportStatementDecl_0_0_1_0_Assignment_alias extends AssignmentT
protected Solution createSolution() {
if((value = current.getConsumable("alias",!IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("alias");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prImportStatementDecl().ele00100LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prImportStatementDecl().ele00100ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -348,11 +350,13 @@ protected class ImportStatementDecl_0_1_Assignment_importURI extends AssignmentT
protected Solution createSolution() {
if((value = current.getConsumable("importURI",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("importURI");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prImportStatementDecl().ele010LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prImportStatementDecl().ele010ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -827,11 +831,13 @@ protected class EPackageDecl_0_0_0_0_0_0_1_Assignment_nsURI extends AssignmentTo
protected Solution createSolution() {
if((value = current.getConsumable("nsURI",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("nsURI");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEPackageDecl().ele00000010LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEPackageDecl().ele00000010ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -1230,11 +1236,13 @@ protected class SubEPackageDecl_0_0_0_1_Assignment_name extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prSubEPackageDecl().ele00010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prSubEPackageDecl().ele00010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -1733,11 +1741,13 @@ protected class EDataTypeDecl_0_1_0_0_0_1_Assignment_name extends AssignmentToke
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEDataTypeDecl().ele0100010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEDataTypeDecl().ele0100010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -2037,11 +2047,13 @@ protected class EAnnotationDecl_0_0_0_0_0_1_Assignment_source extends Assignment
protected Solution createSolution() {
if((value = current.getConsumable("source",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("source");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEAnnotationDecl().ele0000010LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEAnnotationDecl().ele0000010ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -2634,11 +2646,13 @@ protected class EClassDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEClassDecl().ele00000010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEClassDecl().ele00000010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -4120,11 +4134,13 @@ protected class EAttributeDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig
protected Solution createSolution() {
if((value = current.getConsumable("lowerBound",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("lowerBound");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEAttributeDecl().ele00010010LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEAttributeDecl().ele00010010ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -4231,11 +4247,13 @@ protected class EAttributeDecl_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEAttributeDecl().ele0010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEAttributeDecl().ele0010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -4299,11 +4317,13 @@ protected class EAttributeDecl_0_1_1_Assignment_defaultValueLiteral extends Assi
protected Solution createSolution() {
if((value = current.getConsumable("defaultValueLiteral",!IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("defaultValueLiteral");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEAttributeDecl().ele0110LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEAttributeDecl().ele0110ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -5177,11 +5197,13 @@ protected class EReferenceDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig
protected Solution createSolution() {
if((value = current.getConsumable("lowerBound",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("lowerBound");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEReferenceDecl().ele00010010LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEReferenceDecl().ele00010010ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -5360,11 +5382,13 @@ protected class EReferenceDecl_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEReferenceDecl().ele010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEReferenceDecl().ele010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -5605,11 +5629,13 @@ protected class EEnumDecl_0_0_0_1_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEEnumDecl().ele00010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEEnumDecl().ele00010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -5854,11 +5880,13 @@ protected class EEnumLiteralDecl_0_0_0_1_Assignment_name extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEEnumLiteralDecl().ele00010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEEnumLiteralDecl().ele00010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -5922,11 +5950,13 @@ protected class EEnumLiteralDecl_0_0_1_1_Assignment_value extends AssignmentToke
protected Solution createSolution() {
if((value = current.getConsumable("value",!IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("value");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEEnumLiteralDecl().ele00110LexerRuleCallINT();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEEnumLiteralDecl().ele00110ParserRuleCallINT();
return new Solution(obj);
}
+
return null;
}
}
@@ -5949,11 +5979,13 @@ protected class EEnumLiteralDecl_0_1_Assignment_literal extends AssignmentToken
protected Solution createSolution() {
if((value = current.getConsumable("literal",!IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("literal");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEEnumLiteralDecl().ele010LexerRuleCallSTRING();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEEnumLiteralDecl().ele010ParserRuleCallSTRING();
return new Solution(obj);
}
+
return null;
}
}
@@ -6028,11 +6060,13 @@ protected class ETypeParameterDecl_0_Assignment_name extends AssignmentToken {
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prETypeParameterDecl().ele00LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prETypeParameterDecl().ele00ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}
@@ -7658,11 +7692,13 @@ protected class EOperationDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentT
protected Solution createSolution() {
if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
IInstanceDescription obj = current.cloneAndConsume("name");
- if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.prEOperationDecl().ele00000010LexerRuleCallID();
+
+ if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
+ type = AssignmentType.PRC;
+ element = grammarAccess.prEOperationDecl().ele00000010ParserRuleCallID();
return new Solution(obj);
}
+
return null;
}
}