aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-18 12:58:19 (EDT)
committersefftinge2009-03-18 12:58:19 (EDT)
commit58e4b8923bc5aa474d9cc08d4cdc1be515d02c33 (patch)
tree3f4d6ea4773c56cbb84def014a6de9807895df02
parente8a1641d8ba9f28f3e0b36485a1068a13c037788 (diff)
downloadorg.eclipse.xtext-58e4b8923bc5aa474d9cc08d4cdc1be515d02c33.zip
org.eclipse.xtext-58e4b8923bc5aa474d9cc08d4cdc1be515d02c33.tar.gz
org.eclipse.xtext-58e4b8923bc5aa474d9cc08d4cdc1be515d02c33.tar.bz2
EnumRules - first shot (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=242356)
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g5
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java84
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java20
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g16
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java4
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java15
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g33
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java76
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java598
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g14
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java1
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g23
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java96
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java1615
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g24
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java2
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java5
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g1
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java76
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g14
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsFactory.java37
-rw-r--r--tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsPackage.java115
-rw-r--r--tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/ExistingEnum.java239
-rw-r--r--tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsFactoryImpl.java139
-rw-r--r--tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsPackageImpl.java173
-rw-r--r--tests/org.eclipse.xtext.generator.tests/plugin.properties8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/plugin.xml_gen9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageRuntimeModule.java86
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.ecore13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xmi215
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguageCheckValidator.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguageStandaloneSetup.java44
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/EnumRulesTestLanguageFactory.java46
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/EnumRulesTestLanguagePackage.java213
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/GeneratedEnum.java226
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/Model.java89
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguageFactoryImpl.java166
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java242
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/ModelImpl.java239
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/util/EnumRulesTestLanguageAdapterFactory.java135
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/util/EnumRulesTestLanguageSwitch.java141
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parseTreeConstruction/EnumRulesTestLanguageParsetreeConstructor.java193
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/EnumRulesTestLanguageAntlrTokenFileProvider.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/EnumRulesTestLanguageParser.java56
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/internal/InternalEnumRulesTestLanguage.g203
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/internal/InternalEnumRulesTestLanguage.tokens12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/internal/InternalEnumRulesTestLanguageLexer.java1117
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/internal/InternalEnumRulesTestLanguageParser.java448
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/antlr/internal/InternalEnumRulesTestLanguage__.g37
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/EnumRulesTestLanguageDelimiters.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/EnumRulesTestLanguagePackratParser.java31
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/EnumRulesTestLanguageParserConfiguration.java127
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/consumers/EnumRulesTestLanguageExistingEnumConsumer.java148
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/consumers/EnumRulesTestLanguageGeneratedEnumConsumer.java121
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/parser/packrat/consumers/EnumRulesTestLanguageModelConsumer.java228
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java220
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/parser/antlr/internal/InternalLowerCaseNamedTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/services/LowerCaseNamedTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalBaseInheritanceTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g31
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java92
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java513
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalInheritanceTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMultiGenMMTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g149
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1723
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/antlr/internal/InternalDatatypeRulesTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage.g37
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageLexer.java82
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguageParser.java1643
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/antlr/internal/InternalEpatchTestLanguage__.g16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage.g21
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageLexer.java34
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguageParser.java455
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalHiddenTerminalsTestLanguage__.g8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g149
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java1723
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java150
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/antlr/internal/InternalFormatterTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage.g29
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguageParser.java373
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalComplexReconstrTestLanguage__.g14
-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/antlr/internal/InternalSimpleReconstrTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguageParser.java492
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/antlr/internal/InternalSimpleReconstrTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTest.g13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTestLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTestParser.java153
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/antlr/internal/InternalTransientValuesTest__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/antlr/internal/InternalMultiValueFeatureTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/services/MultiValueFeatureTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage.g5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguageParser.java47
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalActionTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java144
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalFowlerDslTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguageLexer.java60
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLexerTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguage.g13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguageParser.java253
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalLookaheadTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalOptionalEmptyTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguage.g17
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguageParser.java354
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalPartialParserTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java84
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage.g25
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguageParser.java262
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalSimpleExpressionsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage.g13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguageParser.java135
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java68
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.xtext24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageChecks.chk13
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/EnumRulesTestLanguageRuntimeModule.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/ParserTest.java95
-rwxr-xr-xtests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/enums.ecore11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/enumrules/enums.genmodel15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/PluginTestSuite.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/ParserTestHelper.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/service/AbstractGenericModuleTest.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/text/description.txt13
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext22
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageIDConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g149
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1723
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java8
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g9
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java144
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g5
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java84
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g16
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java13
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/parser/antlr/internal/InternalTwoContextsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/services/TwoContextsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/parser/antlr/internal/InternalTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/services/TestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext26
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g149
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguageParser.java1723
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java1
-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/ReferenceGrammarTestLanguage.xmi2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/ReferenceGrammarTestLanguageParsetreeConstructor.java8
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g9
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguageParser.java144
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g5
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.tokens2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageLexer.java84
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguageParser.java16
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g16
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguageLexer.java76
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFarbeConsumer.java2
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java1
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java13
-rw-r--r--tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java1
300 files changed, 15177 insertions, 10853 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
index 8d6675c..4aff921 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
@@ -158,7 +158,7 @@
<groups xsi:type="xtext:Keyword" value="ROT"/>
<groups xsi:type="xtext:Keyword" value="BLAU"/>
<groups xsi:type="xtext:Keyword" value="GELB"/>
- <groups xsi:type="xtext:Keyword" value="GR&#x2039;N"/>
+ <groups xsi:type="xtext:Keyword" value="GR&#xdc;N"/>
</terminal>
</alternatives>
</rules>
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 818a892..f1b398d 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
@@ -1148,11 +1148,11 @@ protected class Familie_7_Keyword extends KeywordToken {
/************ begin Rule Farbe ****************
*
* Farbe:
- * wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
+ * wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" );
*
**/
-// wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" )
+// wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" )
protected class Farbe_Assignment_wert extends AssignmentToken {
public Farbe_Assignment_wert(IInstanceDescription curr, AbstractToken pred) {
@@ -1192,7 +1192,7 @@ protected class Farbe_Assignment_wert extends AssignmentToken {
if("GRÜN".equals(value)) { // xtext::Keyword
type = AssignmentType.KW;
- element = grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3();
+ element = grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3();
return new Solution(obj);
}
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 7ded1c1..d602dda 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
@@ -637,9 +637,9 @@ ruleFarbe returns [EObject current=null]
}
- |'GR\u2039N'
+ |'GR\u00DCN'
{
- createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert");
+ createLeafNode(grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3(), "wert");
}
)
@@ -707,6 +707,7 @@ ruleCustomTypeParserRule returns [EObject current=null]
+
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
index 812efac..cdbc2b6 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
@@ -5,8 +5,8 @@ RULE_INT=4
RULE_STRING=5
RULE_ANY_OTHER=10
RULE_SL_COMMENT=8
+'GR\u00DCN'=25
'ROT'=22
-'GR\u2039N'=25
'spielzeug'=18
'spielplatz'=11
')'=16
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 149872f..99b0002 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
@@ -307,10 +307,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
public final void mT25() throws RecognitionException {
try {
int _type = T25;
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u2039N' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u2039N'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u00DCN' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u00DCN'
{
- match("GR\u2039N");
+ match("GR\u00DCN");
}
@@ -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:710: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:710: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:711: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:711: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:710:11: ( '^' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711: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:710:11: '^'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711: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:710:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:40: ( '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:712:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:712:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:712:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713: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:712:13: '0' .. '9'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:13: '0' .. '9'
{
matchRange('0','9');
@@ -471,10 +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:714: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:714: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:715: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:715: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:714: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:715:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -486,16 +486,16 @@ public class InternalReferenceGrammarLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("714:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("715: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:714:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:714:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -511,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:714:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715: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' ) {
@@ -528,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:714:64: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:64: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -554,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:714:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:714:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -573,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:714:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:92: '\\\\' ( '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' ) {
@@ -590,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:714:134: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:134: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -632,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:716:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:716:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:716:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -662,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:716:52: .
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:52: .
{
matchAny();
@@ -690,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:718:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:718:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:718:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -708,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:718:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719: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();
@@ -729,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:718:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -738,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:718:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:718:41: ( '\\r' )?
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -749,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:718:41: '\\r'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:41: '\\r'
{
match('\r');
@@ -779,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:720:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:720:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:720:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -835,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:722:16: ( . )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:722:18: .
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:723:16: ( . )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:723:18: .
{
matchAny();
@@ -1201,7 +1201,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
{
int LA12_35 = input.LA(3);
- if ( (LA12_35=='\u2039') ) {
+ if ( (LA12_35=='\u00DC') ) {
alt12=15;
}
else {
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 9cecde8..cf1e7ac 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
@@ -23,7 +23,7 @@ import java.util.ArrayList;
public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'type'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'type'"
};
public static final int RULE_ML_COMMENT=7;
public static final int RULE_ID=6;
@@ -1118,7 +1118,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
// $ANTLR start ruleFarbe
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) ;
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) ;
public final EObject ruleFarbe() throws RecognitionException {
EObject current = null;
@@ -1127,13 +1127,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:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) )
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )
{
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )
int alt6=4;
switch ( input.LA(1) ) {
case 22:
@@ -1158,7 +1158,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
break;
default:
NoViableAltException nvae =
- new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 6, 0, input);
+ new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 6, 0, input);
throw nvae;
}
@@ -1195,11 +1195,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
}
break;
case 4 :
- // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u2039N'
+ // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u00DCN'
{
match(input,25,FOLLOW_25_in_ruleFarbe1292);
- createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert");
+ createLeafNode(grammarAccess.getFarbeAccess().getWertGRÜNKeyword_0_3(), "wert");
}
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 a7a7d47..41332ce 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
@@ -21,28 +21,28 @@ T21 : ',' ;
T22 : 'ROT' ;
T23 : 'BLAU' ;
T24 : 'GELB' ;
-T25 : 'GR\u2039N' ;
+T25 : 'GR\u00DCN' ;
T26 : 'type' ;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 710
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 711
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" 712
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 713
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 714
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 715
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" 716
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 717
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 718
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 719
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 720
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 721
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 722
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 723
RULE_ANY_OTHER : .;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
index b4ca334..2ce805b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
@@ -142,11 +142,11 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer {
keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0());
keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1());
keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2());
- keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3());
+ keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRÜNKeyword_0_3());
keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0());
keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1());
keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2());
- keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3());
+ keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRÜNKeyword_0_3());
}
@Override
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 4934825..5f04e84 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
@@ -348,16 +348,16 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
private final Keyword cWertROTKeyword_0_0 = (Keyword)cWertAlternatives_0.eContents().get(0);
private final Keyword cWertBLAUKeyword_0_1 = (Keyword)cWertAlternatives_0.eContents().get(1);
private final Keyword cWertGELBKeyword_0_2 = (Keyword)cWertAlternatives_0.eContents().get(2);
- private final Keyword cWertGRNKeyword_0_3 = (Keyword)cWertAlternatives_0.eContents().get(3);
+ private final Keyword cWertGRÜNKeyword_0_3 = (Keyword)cWertAlternatives_0.eContents().get(3);
//Farbe:
- // wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
+ // wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" );
public ParserRule getRule() { return rule; }
- //wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" )
+ //wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" )
public Assignment getWertAssignment() { return cWertAssignment; }
- //"ROT"|"BLAU"|"GELB"|"GR\u2039N"
+ //"ROT"|"BLAU"|"GELB"|"GR\u00DCN"
public Alternatives getWertAlternatives_0() { return cWertAlternatives_0; }
//"ROT"
@@ -369,8 +369,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
//"GELB"
public Keyword getWertGELBKeyword_0_2() { return cWertGELBKeyword_0_2; }
- //"GR\u2039N"
- public Keyword getWertGRNKeyword_0_3() { return cWertGRNKeyword_0_3; }
+ //"GR\u00DCN"
+ public Keyword getWertGRÜNKeyword_0_3() { return cWertGRÜNKeyword_0_3; }
}
public class CustomTypeParserRuleElements implements IParserRuleAccess {
@@ -397,6 +397,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
}
+
private SpielplatzElements pSpielplatz;
private PersonElements pPerson;
private KindElements pKind;
@@ -488,7 +489,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
}
//Farbe:
- // wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
+ // wert=( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" );
public FarbeElements getFarbeAccess() {
return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements());
}
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 f95d31d..ae08fd4 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
@@ -198,10 +198,6 @@ ruleNamedElement returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), currentNode);
@@ -211,10 +207,6 @@ ruleNamedElement returns [EObject current=null]
$current = $this_Type_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), null);
- }
);
@@ -321,10 +313,6 @@ ruleType returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), currentNode);
@@ -334,10 +322,6 @@ ruleType returns [EObject current=null]
$current = $this_DataType_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), null);
- }
);
@@ -508,10 +492,6 @@ ruleFeature returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), currentNode);
@@ -521,10 +501,6 @@ ruleFeature returns [EObject current=null]
$current = $this_Operation_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), null);
- }
);
@@ -556,10 +532,6 @@ ruleStructuralFeature returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), currentNode);
@@ -569,10 +541,6 @@ ruleStructuralFeature returns [EObject current=null]
$current = $this_Reference_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), null);
- }
);
@@ -1006,6 +974,7 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
+
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
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 66ac974..092a271 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:1009: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:1009: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:978: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:978: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:1009:11: ( '^' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:978: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:1009:11: '^'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:978: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:1009:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:978:40: ( '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:1011:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980: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:1011:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:13: '0' .. '9'
{
matchRange('0','9');
@@ -469,10 +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:1013: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:1013: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:982: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:982: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:1013: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:982:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -484,16 +484,16 @@ public class InternalDomainmodelLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("1013:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("982: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:1013:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -509,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:1013:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982: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' ) {
@@ -526,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:1013:64: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:64: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -552,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:1013:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -571,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:1013:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:92: '\\\\' ( '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' ) {
@@ -588,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:1013:134: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:982:134: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -630,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:1015:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:984:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:984:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:984:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -660,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:1015:52: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:984:52: .
{
matchAny();
@@ -688,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:1017:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -706,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:1017:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986: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();
@@ -727,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:1017:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -736,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:1017:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:41: ( '\\r' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -747,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:1017:41: '\\r'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:986:41: '\\r'
{
match('\r');
@@ -777,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:1019:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1019:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:988:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:988:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1019:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:988:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -833,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:1021:16: ( . )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1021:18: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:990:16: ( . )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:990: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 202b6b5..73fcd4b 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
@@ -410,19 +410,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Package_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:206:5: this_Type_1= ruleType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:202:5: this_Type_1= ruleType
{
currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleType_in_ruleNamedElement415);
+ pushFollow(FOLLOW_ruleType_in_ruleNamedElement408);
this_Type_1=ruleType();
_fsp--;
@@ -430,9 +427,6 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Type_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), null);
-
}
break;
@@ -459,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:225: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:217:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ;
public final EObject entryRulePackage() throws RecognitionException {
EObject current = null;
@@ -467,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:225:49: (iv_rulePackage= rulePackage EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:226:2: iv_rulePackage= rulePackage EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:217:49: (iv_rulePackage= rulePackage EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:218:2: iv_rulePackage= rulePackage EOF
{
currentNode = createCompositeNode(grammarAccess.getPackageRule(), currentNode);
- pushFollow(FOLLOW_rulePackage_in_entryRulePackage454);
+ pushFollow(FOLLOW_rulePackage_in_entryRulePackage440);
iv_rulePackage=rulePackage();
_fsp--;
current =iv_rulePackage;
- match(input,EOF,FOLLOW_EOF_in_entryRulePackage464);
+ match(input,EOF,FOLLOW_EOF_in_entryRulePackage450);
}
@@ -494,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:233: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:225:1: rulePackage returns [EObject current=null] : ( 'package' (lv_name_1= ruleQualifiedName ) '{' (lv_namedElements_3= ruleNamedElement )* '}' ) ;
public final EObject rulePackage() throws RecognitionException {
EObject current = null;
@@ -506,23 +500,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:238: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:239: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:230: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:231: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:239: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:239: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:231: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:231:2: 'package' (lv_name_1= ruleQualifiedName ) '{' (lv_namedElements_3= ruleNamedElement )* '}'
{
- match(input,12,FOLLOW_12_in_rulePackage498);
+ match(input,12,FOLLOW_12_in_rulePackage484);
createLeafNode(grammarAccess.getPackageAccess().getPackageKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:243:1: (lv_name_1= ruleQualifiedName )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:246:6: lv_name_1= ruleQualifiedName
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:235:1: (lv_name_1= ruleQualifiedName )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:6: lv_name_1= ruleQualifiedName
{
currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNameQualifiedNameParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage532);
+ pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage518);
lv_name_1=ruleQualifiedName();
_fsp--;
@@ -542,11 +536,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,13,FOLLOW_13_in_rulePackage545);
+ match(input,13,FOLLOW_13_in_rulePackage531);
createLeafNode(grammarAccess.getPackageAccess().getLeftCurlyBracketKeyword_2(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:268:1: (lv_namedElements_3= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:260:1: (lv_namedElements_3= ruleNamedElement )*
loop4:
do {
int alt4=2;
@@ -559,12 +553,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:271:6: lv_namedElements_3= ruleNamedElement
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:263:6: lv_namedElements_3= ruleNamedElement
{
currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNamedElementsNamedElementParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleNamedElement_in_rulePackage579);
+ pushFollow(FOLLOW_ruleNamedElement_in_rulePackage565);
lv_namedElements_3=ruleNamedElement();
_fsp--;
@@ -590,7 +584,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,14,FOLLOW_14_in_rulePackage593);
+ match(input,14,FOLLOW_14_in_rulePackage579);
createLeafNode(grammarAccess.getPackageAccess().getRightCurlyBracketKeyword_4(), null);
@@ -617,7 +611,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:300: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:292:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
public final EObject entryRuleType() throws RecognitionException {
EObject current = null;
@@ -625,16 +619,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../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
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:292:46: (iv_ruleType= ruleType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:293:2: iv_ruleType= ruleType EOF
{
currentNode = createCompositeNode(grammarAccess.getTypeRule(), currentNode);
- pushFollow(FOLLOW_ruleType_in_entryRuleType626);
+ pushFollow(FOLLOW_ruleType_in_entryRuleType612);
iv_ruleType=ruleType();
_fsp--;
current =iv_ruleType;
- match(input,EOF,FOLLOW_EOF_in_entryRuleType636);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleType622);
}
@@ -652,7 +646,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:308: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:300:1: ruleType returns [EObject current=null] : (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) ;
public final EObject ruleType() throws RecognitionException {
EObject current = null;
@@ -664,10 +658,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: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:305: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:306: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 )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:306:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -679,18 +673,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("314:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )", 5, 0, input);
+ new NoViableAltException("306: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:315:5: this_Entity_0= ruleEntity
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:307:5: this_Entity_0= ruleEntity
{
currentNode=createCompositeNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleEntity_in_ruleType683);
+ pushFollow(FOLLOW_ruleEntity_in_ruleType669);
this_Entity_0=ruleEntity();
_fsp--;
@@ -698,19 +692,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Entity_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:329:5: this_DataType_1= ruleDataType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:317:5: this_DataType_1= ruleDataType
{
currentNode=createCompositeNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleDataType_in_ruleType717);
+ pushFollow(FOLLOW_ruleDataType_in_ruleType696);
this_DataType_1=ruleDataType();
_fsp--;
@@ -718,9 +709,6 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_DataType_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), null);
-
}
break;
@@ -747,7 +735,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:348: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:332:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
public final EObject entryRuleDataType() throws RecognitionException {
EObject current = null;
@@ -755,16 +743,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:348:50: (iv_ruleDataType= ruleDataType EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:2: iv_ruleDataType= ruleDataType EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:332:50: (iv_ruleDataType= ruleDataType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:333:2: iv_ruleDataType= ruleDataType EOF
{
currentNode = createCompositeNode(grammarAccess.getDataTypeRule(), currentNode);
- pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType756);
+ pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType728);
iv_ruleDataType=ruleDataType();
_fsp--;
current =iv_ruleDataType;
- match(input,EOF,FOLLOW_EOF_in_entryRuleDataType766);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDataType738);
}
@@ -782,7 +770,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:356: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:340:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ;
public final EObject ruleDataType() throws RecognitionException {
EObject current = null;
@@ -791,21 +779,21 @@ 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:361:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:1: ( 'datatype' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:345:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:346:1: ( 'datatype' (lv_name_1= RULE_ID ) )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:1: ( 'datatype' (lv_name_1= RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:2: 'datatype' (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:346:1: ( 'datatype' (lv_name_1= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:346:2: 'datatype' (lv_name_1= RULE_ID )
{
- match(input,15,FOLLOW_15_in_ruleDataType800);
+ match(input,15,FOLLOW_15_in_ruleDataType772);
createLeafNode(grammarAccess.getDataTypeAccess().getDatatypeKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:366:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:368:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:350:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:352:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType822);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType794);
createLeafNode(grammarAccess.getDataTypeAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -847,7 +835,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:393: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:377:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ;
public final EObject entryRuleEntity() throws RecognitionException {
EObject current = null;
@@ -855,16 +843,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:393:48: (iv_ruleEntity= ruleEntity EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:394:2: iv_ruleEntity= ruleEntity EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:377:48: (iv_ruleEntity= ruleEntity EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:378:2: iv_ruleEntity= ruleEntity EOF
{
currentNode = createCompositeNode(grammarAccess.getEntityRule(), currentNode);
- pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity863);
+ pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity835);
iv_ruleEntity=ruleEntity();
_fsp--;
current =iv_ruleEntity;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEntity873);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEntity845);
}
@@ -882,7 +870,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:401: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:385: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;
@@ -893,21 +881,21 @@ 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:406: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:407: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:390: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:391: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:407: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:407: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:391: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:391:2: 'entity' (lv_name_1= RULE_ID ) ( 'extends' ( RULE_ID ) )? '{' (lv_features_5= ruleFeature )* '}'
{
- match(input,16,FOLLOW_16_in_ruleEntity907);
+ match(input,16,FOLLOW_16_in_ruleEntity879);
createLeafNode(grammarAccess.getEntityAccess().getEntityKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:411:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:413:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity929);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity901);
createLeafNode(grammarAccess.getEntityAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -926,7 +914,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:431:2: ( 'extends' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:415:2: ( 'extends' ( RULE_ID ) )?
int alt6=2;
int LA6_0 = input.LA(1);
@@ -935,14 +923,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:431:3: 'extends' ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:415:3: 'extends' ( RULE_ID )
{
- match(input,17,FOLLOW_17_in_ruleEntity947);
+ match(input,17,FOLLOW_17_in_ruleEntity919);
createLeafNode(grammarAccess.getEntityAccess().getExtendsKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:438:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:419:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:422:3: RULE_ID
{
if (current==null) {
@@ -950,7 +938,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity969);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity941);
createLeafNode(grammarAccess.getEntityAccess().getSuperTypeEntityCrossReference_2_1_0(), "superType");
@@ -963,11 +951,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,13,FOLLOW_13_in_ruleEntity983);
+ match(input,13,FOLLOW_13_in_ruleEntity955);
createLeafNode(grammarAccess.getEntityAccess().getLeftCurlyBracketKeyword_3(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:455:1: (lv_features_5= ruleFeature )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:439:1: (lv_features_5= ruleFeature )*
loop7:
do {
int alt7=2;
@@ -980,12 +968,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:458:6: lv_features_5= ruleFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:442:6: lv_features_5= ruleFeature
{
currentNode=createCompositeNode(grammarAccess.getEntityAccess().getFeaturesFeatureParserRuleCall_4_0(), currentNode);
- pushFollow(FOLLOW_ruleFeature_in_ruleEntity1017);
+ pushFollow(FOLLOW_ruleFeature_in_ruleEntity989);
lv_features_5=ruleFeature();
_fsp--;
@@ -1011,7 +999,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,14,FOLLOW_14_in_ruleEntity1031);
+ match(input,14,FOLLOW_14_in_ruleEntity1003);
createLeafNode(grammarAccess.getEntityAccess().getRightCurlyBracketKeyword_5(), null);
@@ -1038,7 +1026,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:487: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:471:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
public final EObject entryRuleFeature() throws RecognitionException {
EObject current = null;
@@ -1046,16 +1034,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:487:49: (iv_ruleFeature= ruleFeature EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:488:2: iv_ruleFeature= ruleFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:471:49: (iv_ruleFeature= ruleFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:472:2: iv_ruleFeature= ruleFeature EOF
{
currentNode = createCompositeNode(grammarAccess.getFeatureRule(), currentNode);
- pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1064);
+ pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1036);
iv_ruleFeature=ruleFeature();
_fsp--;
current =iv_ruleFeature;
- match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1074);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1046);
}
@@ -1073,7 +1061,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:495: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:479:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ;
public final EObject ruleFeature() throws RecognitionException {
EObject current = null;
@@ -1085,10 +1073,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:500: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:501: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:484: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:485: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:501: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:485:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -1100,18 +1088,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("501:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )", 8, 0, input);
+ new NoViableAltException("485: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:502:5: this_StructuralFeature_0= ruleStructuralFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:5: this_StructuralFeature_0= ruleStructuralFeature
{
currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1121);
+ pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1093);
this_StructuralFeature_0=ruleStructuralFeature();
_fsp--;
@@ -1119,19 +1107,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_StructuralFeature_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:516:5: this_Operation_1= ruleOperation
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:496:5: this_Operation_1= ruleOperation
{
currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleOperation_in_ruleFeature1155);
+ pushFollow(FOLLOW_ruleOperation_in_ruleFeature1120);
this_Operation_1=ruleOperation();
_fsp--;
@@ -1139,9 +1124,6 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Operation_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), null);
-
}
break;
@@ -1168,7 +1150,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:535: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:511:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ;
public final EObject entryRuleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1176,16 +1158,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:535:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:511:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:512:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
{
currentNode = createCompositeNode(grammarAccess.getStructuralFeatureRule(), currentNode);
- pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1194);
+ pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1152);
iv_ruleStructuralFeature=ruleStructuralFeature();
_fsp--;
current =iv_ruleStructuralFeature;
- match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1204);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1162);
}
@@ -1203,7 +1185,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:543: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:519:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ;
public final EObject ruleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1215,10 +1197,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:548: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:549: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:524: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:525: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:549: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:525:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1230,18 +1212,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("549:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )", 9, 0, input);
+ new NoViableAltException("525: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:550:5: this_Attribute_0= ruleAttribute
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:526:5: this_Attribute_0= ruleAttribute
{
currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1251);
+ pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1209);
this_Attribute_0=ruleAttribute();
_fsp--;
@@ -1249,19 +1231,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Attribute_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:564:5: this_Reference_1= ruleReference
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:5: this_Reference_1= ruleReference
{
currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1285);
+ pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1236);
this_Reference_1=ruleReference();
_fsp--;
@@ -1269,9 +1248,6 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
current = this_Reference_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), null);
-
}
break;
@@ -1298,7 +1274,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:583: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:551:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
public final EObject entryRuleAttribute() throws RecognitionException {
EObject current = null;
@@ -1306,16 +1282,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:583:51: (iv_ruleAttribute= ruleAttribute EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: iv_ruleAttribute= ruleAttribute EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:551:51: (iv_ruleAttribute= ruleAttribute EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:552:2: iv_ruleAttribute= ruleAttribute EOF
{
currentNode = createCompositeNode(grammarAccess.getAttributeRule(), currentNode);
- pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1324);
+ pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1268);
iv_ruleAttribute=ruleAttribute();
_fsp--;
current =iv_ruleAttribute;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1334);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1278);
}
@@ -1333,7 +1309,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:591: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:559: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;
@@ -1344,21 +1320,21 @@ 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:596: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:597: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:564: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:565: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:597: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:597: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:565: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:565:2: 'attr' (lv_name_1= RULE_ID ) ':' (lv_type_3= ruleTypeRef )
{
- match(input,18,FOLLOW_18_in_ruleAttribute1368);
+ match(input,18,FOLLOW_18_in_ruleAttribute1312);
createLeafNode(grammarAccess.getAttributeAccess().getAttrKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:601:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:603:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:569:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1390);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1334);
createLeafNode(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -1377,17 +1353,17 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,19,FOLLOW_19_in_ruleAttribute1407);
+ match(input,19,FOLLOW_19_in_ruleAttribute1351);
createLeafNode(grammarAccess.getAttributeAccess().getColonKeyword_2(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:625:1: (lv_type_3= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:628:6: lv_type_3= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:593:1: (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:596:6: lv_type_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.getAttributeAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1441);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1385);
lv_type_3=ruleTypeRef();
_fsp--;
@@ -1430,7 +1406,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:653: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:621:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
public final EObject entryRuleReference() throws RecognitionException {
EObject current = null;
@@ -1438,16 +1414,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:653:51: (iv_ruleReference= ruleReference EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:654:2: iv_ruleReference= ruleReference EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:621:51: (iv_ruleReference= ruleReference EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:622:2: iv_ruleReference= ruleReference EOF
{
currentNode = createCompositeNode(grammarAccess.getReferenceRule(), currentNode);
- pushFollow(FOLLOW_ruleReference_in_entryRuleReference1478);
+ pushFollow(FOLLOW_ruleReference_in_entryRuleReference1422);
iv_ruleReference=ruleReference();
_fsp--;
current =iv_ruleReference;
- match(input,EOF,FOLLOW_EOF_in_entryRuleReference1488);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleReference1432);
}
@@ -1465,7 +1441,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:661: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:629: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;
@@ -1476,21 +1452,21 @@ 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:666: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:667: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:634: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:635: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:667: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:667: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:635: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:635:2: 'ref' (lv_name_1= RULE_ID ) ':' (lv_type_3= ruleTypeRef ) ( 'opposite' ( RULE_ID ) )?
{
- match(input,20,FOLLOW_20_in_ruleReference1522);
+ match(input,20,FOLLOW_20_in_ruleReference1466);
createLeafNode(grammarAccess.getReferenceAccess().getRefKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:671:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:673:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:639:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:641:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1544);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1488);
createLeafNode(grammarAccess.getReferenceAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -1509,17 +1485,17 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,19,FOLLOW_19_in_ruleReference1561);
+ match(input,19,FOLLOW_19_in_ruleReference1505);
createLeafNode(grammarAccess.getReferenceAccess().getColonKeyword_2(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:695:1: (lv_type_3= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:698:6: lv_type_3= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:663:1: (lv_type_3= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:666:6: lv_type_3= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.getReferenceAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1595);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1539);
lv_type_3=ruleTypeRef();
_fsp--;
@@ -1539,7 +1515,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:716:2: ( 'opposite' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:684:2: ( 'opposite' ( RULE_ID ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1548,14 +1524,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:716:3: 'opposite' ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:684:3: 'opposite' ( RULE_ID )
{
- match(input,21,FOLLOW_21_in_ruleReference1609);
+ match(input,21,FOLLOW_21_in_ruleReference1553);
createLeafNode(grammarAccess.getReferenceAccess().getOppositeKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:720:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:723:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:688:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:691:3: RULE_ID
{
if (current==null) {
@@ -1563,7 +1539,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1631);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1575);
createLeafNode(grammarAccess.getReferenceAccess().getOppositeReferenceCrossReference_4_1_0(), "opposite");
@@ -1599,7 +1575,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:743: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:711:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ;
public final EObject entryRuleOperation() throws RecognitionException {
EObject current = null;
@@ -1607,16 +1583,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:51: (iv_ruleOperation= ruleOperation EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:744:2: iv_ruleOperation= ruleOperation EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:711:51: (iv_ruleOperation= ruleOperation EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:712:2: iv_ruleOperation= ruleOperation EOF
{
currentNode = createCompositeNode(grammarAccess.getOperationRule(), currentNode);
- pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1669);
+ pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1613);
iv_ruleOperation=ruleOperation();
_fsp--;
current =iv_ruleOperation;
- match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1679);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1623);
}
@@ -1634,7 +1610,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:751: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:719: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;
@@ -1649,21 +1625,21 @@ 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:756: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:757: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:724: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:725: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:757: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:757: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:725: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:725:2: 'op' (lv_name_1= RULE_ID ) '(' ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ')' ':' (lv_type_8= ruleTypeRef )
{
- match(input,22,FOLLOW_22_in_ruleOperation1713);
+ match(input,22,FOLLOW_22_in_ruleOperation1657);
createLeafNode(grammarAccess.getOperationAccess().getOpKeyword_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:761:1: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:763:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:729:1: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:731:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1735);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1679);
createLeafNode(grammarAccess.getOperationAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -1682,11 +1658,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,23,FOLLOW_23_in_ruleOperation1752);
+ match(input,23,FOLLOW_23_in_ruleOperation1696);
createLeafNode(grammarAccess.getOperationAccess().getLeftParenthesisKeyword_2(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:1: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:753:1: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1695,15 +1671,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:785: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:753: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:785:2: (lv_params_3= ruleParameter )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:788:6: lv_params_3= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:753:2: (lv_params_3= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:756:6: lv_params_3= ruleParameter
{
currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_0_0(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_ruleOperation1787);
+ pushFollow(FOLLOW_ruleParameter_in_ruleOperation1731);
lv_params_3=ruleParameter();
_fsp--;
@@ -1723,7 +1699,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:806:2: ( ',' (lv_params_5= ruleParameter ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:774:2: ( ',' (lv_params_5= ruleParameter ) )*
loop11:
do {
int alt11=2;
@@ -1736,19 +1712,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:806:3: ',' (lv_params_5= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:774:3: ',' (lv_params_5= ruleParameter )
{
- match(input,24,FOLLOW_24_in_ruleOperation1801);
+ match(input,24,FOLLOW_24_in_ruleOperation1745);
createLeafNode(grammarAccess.getOperationAccess().getCommaKeyword_3_1_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:810:1: (lv_params_5= ruleParameter )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:813:6: lv_params_5= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:778:1: (lv_params_5= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:781:6: lv_params_5= ruleParameter
{
currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_ruleOperation1835);
+ pushFollow(FOLLOW_ruleParameter_in_ruleOperation1779);
lv_params_5=ruleParameter();
_fsp--;
@@ -1783,21 +1759,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- match(input,25,FOLLOW_25_in_ruleOperation1852);
+ match(input,25,FOLLOW_25_in_ruleOperation1796);
createLeafNode(grammarAccess.getOperationAccess().getRightParenthesisKeyword_4(), null);
- match(input,19,FOLLOW_19_in_ruleOperation1861);
+ match(input,19,FOLLOW_19_in_ruleOperation1805);
createLeafNode(grammarAccess.getOperationAccess().getColonKeyword_5(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:839:1: (lv_type_8= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:842:6: lv_type_8= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:807:1: (lv_type_8= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:810:6: lv_type_8= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.getOperationAccess().getTypeTypeRefParserRuleCall_6_0(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1895);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1839);
lv_type_8=ruleTypeRef();
_fsp--;
@@ -1840,7 +1816,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:867: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:835:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
public final EObject entryRuleParameter() throws RecognitionException {
EObject current = null;
@@ -1848,16 +1824,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:867:51: (iv_ruleParameter= ruleParameter EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:2: iv_ruleParameter= ruleParameter EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:835:51: (iv_ruleParameter= ruleParameter EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:836:2: iv_ruleParameter= ruleParameter EOF
{
currentNode = createCompositeNode(grammarAccess.getParameterRule(), currentNode);
- pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1932);
+ pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1876);
iv_ruleParameter=ruleParameter();
_fsp--;
current =iv_ruleParameter;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1942);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1886);
}
@@ -1875,7 +1851,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:875: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:843:1: ruleParameter returns [EObject current=null] : ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ;
public final EObject ruleParameter() throws RecognitionException {
EObject current = null;
@@ -1886,17 +1862,17 @@ 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:880: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:881: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:848: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:849: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:881: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:881: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:849: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:849: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:881:2: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:883:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:849:2: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:851:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1989);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1933);
createLeafNode(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_0_0(), "name");
@@ -1915,13 +1891,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:901:2: (lv_type_1= ruleTypeRef )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:904:6: lv_type_1= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:869:2: (lv_type_1= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:872:6: lv_type_1= ruleTypeRef
{
currentNode=createCompositeNode(grammarAccess.getParameterAccess().getTypeTypeRefParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2031);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter1975);
lv_type_1=ruleTypeRef();
_fsp--;
@@ -1964,7 +1940,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:931: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:899:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
public final EObject entryRuleTypeRef() throws RecognitionException {
EObject current = null;
@@ -1972,16 +1948,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:931:49: (iv_ruleTypeRef= ruleTypeRef EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:2: iv_ruleTypeRef= ruleTypeRef EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:899:49: (iv_ruleTypeRef= ruleTypeRef EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:900:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode(grammarAccess.getTypeRefRule(), currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2070);
+ pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2014);
iv_ruleTypeRef=ruleTypeRef();
_fsp--;
current =iv_ruleTypeRef;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2080);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2024);
}
@@ -1999,18 +1975,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:939:1: ruleTypeRef returns [EObject current=null] : ( RULE_ID ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:907: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:944:6: ( ( RULE_ID ) )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:945:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:912:6: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:913:1: ( RULE_ID )
{
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:945:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:948:3: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:913:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:916:3: RULE_ID
{
if (current==null) {
@@ -2018,7 +1994,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2126);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2070);
createLeafNode(grammarAccess.getTypeRefAccess().getReferencedTypeCrossReference_0(), "referenced");
@@ -2045,7 +2021,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:968: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:936:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
public final String entryRuleQualifiedName() throws RecognitionException {
String current = null;
@@ -2053,16 +2029,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:968:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:969:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:936:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:937:2: iv_ruleQualifiedName= ruleQualifiedName EOF
{
currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode);
- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2162);
+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2106);
iv_ruleQualifiedName=ruleQualifiedName();
_fsp--;
current =iv_ruleQualifiedName.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2173);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2117);
}
@@ -2080,7 +2056,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:976: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:944: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();
@@ -2091,21 +2067,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:982: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:983: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:950: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:951: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:983: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:983: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:951: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:951: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_ruleQualifiedName2213);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2157);
current.merge(this_ID_0);
createLeafNode(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0(), null);
- // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:990:1: (kw= '.' this_ID_2= RULE_ID )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:1: (kw= '.' this_ID_2= RULE_ID )*
loop13:
do {
int alt13=2;
@@ -2118,16 +2094,16 @@ 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:991:2: kw= '.' this_ID_2= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:2: kw= '.' this_ID_2= RULE_ID
{
kw=(Token)input.LT(1);
- match(input,26,FOLLOW_26_in_ruleQualifiedName2232);
+ match(input,26,FOLLOW_26_in_ruleQualifiedName2176);
current.merge(kw);
createLeafNode(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0(), null);
this_ID_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2247);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2191);
current.merge(this_ID_2);
@@ -2179,75 +2155,75 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement324 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement334 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement381 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleType_in_ruleNamedElement415 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rulePackage_in_entryRulePackage454 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRulePackage464 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_12_in_rulePackage498 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage532 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_13_in_rulePackage545 = new BitSet(new long[]{0x000000000001D000L});
- public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage579 = new BitSet(new long[]{0x000000000001D000L});
- public static final BitSet FOLLOW_14_in_rulePackage593 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleType_in_entryRuleType626 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleType636 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEntity_in_ruleType683 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDataType_in_ruleType717 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType756 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDataType766 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_ruleDataType800 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleDataType822 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity863 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEntity873 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_ruleEntity907 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEntity929 = new BitSet(new long[]{0x0000000000022000L});
- public static final BitSet FOLLOW_17_in_ruleEntity947 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEntity969 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_13_in_ruleEntity983 = new BitSet(new long[]{0x0000000000544000L});
- public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1017 = new BitSet(new long[]{0x0000000000544000L});
- public static final BitSet FOLLOW_14_in_ruleEntity1031 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1064 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFeature1074 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1121 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1155 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1194 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1204 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1251 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1285 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1324 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1334 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_ruleAttribute1368 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1390 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleAttribute1407 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1441 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1478 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleReference1488 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_ruleReference1522 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleReference1544 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleReference1561 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1595 = new BitSet(new long[]{0x0000000000200002L});
- public static final BitSet FOLLOW_21_in_ruleReference1609 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleReference1631 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1669 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleOperation1679 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_22_in_ruleOperation1713 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1735 = new BitSet(new long[]{0x0000000000800000L});
- public static final BitSet FOLLOW_23_in_ruleOperation1752 = new BitSet(new long[]{0x0000000002000020L});
- public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1787 = new BitSet(new long[]{0x0000000003000000L});
- public static final BitSet FOLLOW_24_in_ruleOperation1801 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1835 = new BitSet(new long[]{0x0000000003000000L});
- public static final BitSet FOLLOW_25_in_ruleOperation1852 = 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_ruleOperation1895 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1932 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParameter1942 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1989 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2031 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2070 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2080 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2126 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2162 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2173 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2213 = new BitSet(new long[]{0x0000000004000002L});
- public static final BitSet FOLLOW_26_in_ruleQualifiedName2232 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2247 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_ruleType_in_ruleNamedElement408 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rulePackage_in_entryRulePackage440 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRulePackage450 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_12_in_rulePackage484 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage518 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_13_in_rulePackage531 = new BitSet(new long[]{0x000000000001D000L});
+ public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage565 = new BitSet(new long[]{0x000000000001D000L});
+ public static final BitSet FOLLOW_14_in_rulePackage579 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleType_in_entryRuleType612 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleType622 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEntity_in_ruleType669 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDataType_in_ruleType696 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType728 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDataType738 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_15_in_ruleDataType772 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleDataType794 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity835 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEntity845 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_16_in_ruleEntity879 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEntity901 = new BitSet(new long[]{0x0000000000022000L});
+ public static final BitSet FOLLOW_17_in_ruleEntity919 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEntity941 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_13_in_ruleEntity955 = new BitSet(new long[]{0x0000000000544000L});
+ public static final BitSet FOLLOW_ruleFeature_in_ruleEntity989 = new BitSet(new long[]{0x0000000000544000L});
+ public static final BitSet FOLLOW_14_in_ruleEntity1003 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1036 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFeature1046 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1093 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1120 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1152 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1162 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1209 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1236 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1268 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1278 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleAttribute1312 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1334 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleAttribute1351 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1385 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1422 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleReference1432 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_20_in_ruleReference1466 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReference1488 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleReference1505 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1539 = new BitSet(new long[]{0x0000000000200002L});
+ public static final BitSet FOLLOW_21_in_ruleReference1553 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReference1575 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1613 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleOperation1623 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_22_in_ruleOperation1657 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1679 = new BitSet(new long[]{0x0000000000800000L});
+ public static final BitSet FOLLOW_23_in_ruleOperation1696 = new BitSet(new long[]{0x0000000002000020L});
+ public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1731 = new BitSet(new long[]{0x0000000003000000L});
+ public static final BitSet FOLLOW_24_in_ruleOperation1745 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1779 = new BitSet(new long[]{0x0000000003000000L});
+ public static final BitSet FOLLOW_25_in_ruleOperation1796 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleOperation1805 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1839 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1876 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParameter1886 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1933 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter1975 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2014 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2024 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2070 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2106 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2117 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2157 = new BitSet(new long[]{0x0000000004000002L});
+ public static final BitSet FOLLOW_26_in_ruleQualifiedName2176 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2191 = 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 c6d6ff5..8edc1c4 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,25 +24,25 @@ T24 : ',' ;
T25 : ')' ;
T26 : '.' ;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1009
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 978
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" 1011
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 980
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1013
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 982
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" 1015
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 984
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1017
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 986
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" 1019
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 988
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1021
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 990
RULE_ANY_OTHER : .;
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 6b086a2..9534380 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
@@ -533,6 +533,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess {
public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
}
+
private FileElements pFile;
private ImportElements pImport;
private NamedElementElements pNamedElement;
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
index af09ad0..50d886a 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
@@ -518,10 +518,6 @@ ruleEClassifierDecl returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getEClassifierDeclAccess().getEClassDeclParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getEClassifierDeclAccess().getEDataTypeDeclParserRuleCall_1(), currentNode);
@@ -531,10 +527,6 @@ ruleEClassifierDecl returns [EObject current=null]
$current = $this_EDataTypeDecl_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getEClassifierDeclAccess().getEDataTypeDeclParserRuleCall_1(), null);
- }
);
@@ -660,10 +652,6 @@ ruleEDataTypeDecl returns [EObject current=null]
$current = $this_EEnumDecl_7.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getEDataTypeDeclAccess().getEEnumDeclParserRuleCall_1(), null);
- }
);
@@ -1084,10 +1072,6 @@ ruleEStructuralFeatureDecl returns [EObject current=null]
currentNode = currentNode.getParent();
}
- {
- createLeafNode(grammarAccess.getEStructuralFeatureDeclAccess().getEAttributeDeclParserRuleCall_0(), null);
- }
-
|
{
currentNode=createCompositeNode(grammarAccess.getEStructuralFeatureDeclAccess().getEReferenceDeclParserRuleCall_1(), currentNode);
@@ -1097,10 +1081,6 @@ ruleEStructuralFeatureDecl returns [EObject current=null]
$current = $this_EReferenceDecl_1.current;
currentNode = currentNode.getParent();
}
-
- {
- createLeafNode(grammarAccess.getEStructuralFeatureDeclAccess().getEReferenceDeclParserRuleCall_1(), null);
- }
);
@@ -2834,7 +2814,7 @@ ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
kw='$'
{
$current.merge(kw);
- createLeafNode(grammarAccess.getQIDAccess().get$Keyword_1_0_1(), null);
+ createLeafNode(grammarAccess.getQIDAccess().getDollarSignKeyword_1_0_1(), null);
}
) this_ID_3=RULE_ID {
$current.merge(this_ID_3);
@@ -2927,6 +2907,7 @@ ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+
RULE_BAG : 'bag';
RULE_RANDOM : 'random';
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
index f4fe276..75b08b3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
@@ -837,8 +837,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_BAG() throws RecognitionException {
try {
int _type = RULE_BAG;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2930:10: ( 'bag' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2930:12: 'bag'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:10: ( 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:12: 'bag'
{
match("bag");
@@ -856,8 +856,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_RANDOM() throws RecognitionException {
try {
int _type = RULE_RANDOM;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2932:13: ( 'random' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2932:15: 'random'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:13: ( 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:15: 'random'
{
match("random");
@@ -875,8 +875,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_READONLY() throws RecognitionException {
try {
int _type = RULE_READONLY;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2934:15: ( 'readonly' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2934:17: 'readonly'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:15: ( 'readonly' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:17: 'readonly'
{
match("readonly");
@@ -894,8 +894,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_LOCAL() throws RecognitionException {
try {
int _type = RULE_LOCAL;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2936:12: ( 'local' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2936:14: 'local'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:12: ( 'local' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:14: 'local'
{
match("local");
@@ -913,8 +913,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_SERIALIZABLE() throws RecognitionException {
try {
int _type = RULE_SERIALIZABLE;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2938:19: ( '!serializable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2938:21: '!serializable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:19: ( '!serializable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:21: '!serializable'
{
match("!serializable");
@@ -932,10 +932,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2940:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2940:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2940:11: ( '^' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -944,7 +944,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2940:11: '^'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: '^'
{
match('^');
@@ -963,7 +963,7 @@ public class InternalEcoreDslLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2940:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -1011,10 +1011,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2942:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2942:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2942:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -1028,7 +1028,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2942:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:13: '0' .. '9'
{
matchRange('0','9');
@@ -1058,10 +1058,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -1073,16 +1073,16 @@ public class InternalEcoreDslLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2944:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("2925:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -1098,7 +1098,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925: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' ) {
@@ -1115,7 +1115,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:64: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:64: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1141,10 +1141,10 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -1160,7 +1160,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:92: '\\\\' ( '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' ) {
@@ -1177,7 +1177,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2944:134: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:134: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1219,12 +1219,12 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2946:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2946:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2946:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -1249,7 +1249,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2946:52: .
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:52: .
{
matchAny();
@@ -1277,12 +1277,12 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -1295,7 +1295,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929: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();
@@ -1316,7 +1316,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1325,9 +1325,9 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:41: ( '\\r' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1336,7 +1336,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2948:41: '\\r'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: '\\r'
{
match('\r');
@@ -1366,10 +1366,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2950:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2950:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2950:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -1422,8 +1422,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2952:16: ( . )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2952:18: .
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2933:16: ( . )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2933:18: .
{
matchAny();
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
index 674fa22..285fe96 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
@@ -973,19 +973,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
current = this_EClassDecl_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getEClassifierDeclAccess().getEClassDeclParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:526:5: this_EDataTypeDecl_1= ruleEDataTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:522:5: this_EDataTypeDecl_1= ruleEDataTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassifierDeclAccess().getEDataTypeDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1075);
+ pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1068);
this_EDataTypeDecl_1=ruleEDataTypeDecl();
_fsp--;
@@ -993,9 +990,6 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
current = this_EDataTypeDecl_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getEClassifierDeclAccess().getEDataTypeDeclParserRuleCall_1(), null);
-
}
break;
@@ -1022,7 +1016,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEDataTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:545:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:537:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ;
public final EObject entryRuleEDataTypeDecl() throws RecognitionException {
EObject current = null;
@@ -1030,16 +1024,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:545:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:546:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:537:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:538:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEDataTypeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1114);
+ pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1100);
iv_ruleEDataTypeDecl=ruleEDataTypeDecl();
_fsp--;
current =iv_ruleEDataTypeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1124);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1110);
}
@@ -1057,7 +1051,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEDataTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:553:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:545:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ;
public final EObject ruleEDataTypeDecl() throws RecognitionException {
EObject current = null;
@@ -1073,20 +1067,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:558:6: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:550:6: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
int alt10=2;
alt10 = dfa10.predict(input);
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:3: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:3: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:3: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:3: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop8:
do {
int alt8=2;
@@ -1099,12 +1093,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:554:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1184);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1170);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -1130,7 +1124,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:580:3: (lv_serializable_1= RULE_SERIALIZABLE )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:572:3: (lv_serializable_1= RULE_SERIALIZABLE )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1139,10 +1133,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:582:6: lv_serializable_1= RULE_SERIALIZABLE
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:574:6: lv_serializable_1= RULE_SERIALIZABLE
{
lv_serializable_1=(Token)input.LT(1);
- match(input,RULE_SERIALIZABLE,FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1211);
+ match(input,RULE_SERIALIZABLE,FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1197);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getSerializableSerializableTerminalRuleCall_0_1_0(), "serializable");
@@ -1164,18 +1158,18 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:600:3: ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:600:4: 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:592:3: ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:592:4: 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';'
{
- match(input,24,FOLLOW_24_in_ruleEDataTypeDecl1230);
+ match(input,24,FOLLOW_24_in_ruleEDataTypeDecl1216);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getDatatypeKeyword_0_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:1: (lv_name_3= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:606:6: lv_name_3= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:596:1: (lv_name_3= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:598:6: lv_name_3= RULE_ID
{
lv_name_3=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1252);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1238);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getNameIDTerminalRuleCall_0_2_1_0(), "name");
@@ -1194,17 +1188,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,25,FOLLOW_25_in_ruleEDataTypeDecl1269);
+ match(input,25,FOLLOW_25_in_ruleEDataTypeDecl1255);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getColonKeyword_0_2_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:628:1: (lv_instanceClassName_5= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:631:6: lv_instanceClassName_5= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:620:1: (lv_instanceClassName_5= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:623:6: lv_instanceClassName_5= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getInstanceClassNameSTRING_OR_QIDParserRuleCall_0_2_3_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1303);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1289);
lv_instanceClassName_5=ruleSTRING_OR_QID();
_fsp--;
@@ -1224,7 +1218,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEDataTypeDecl1316);
+ match(input,18,FOLLOW_18_in_ruleEDataTypeDecl1302);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getSemicolonKeyword_0_2_4(), null);
@@ -1238,12 +1232,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:655:5: this_EEnumDecl_7= ruleEEnumDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:647:5: this_EEnumDecl_7= ruleEEnumDecl
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getEEnumDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1346);
+ pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1332);
this_EEnumDecl_7=ruleEEnumDecl();
_fsp--;
@@ -1251,9 +1245,6 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
current = this_EEnumDecl_7;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getEDataTypeDeclAccess().getEEnumDeclParserRuleCall_1(), null);
-
}
break;
@@ -1280,7 +1271,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEAnnotationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:674:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:662:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ;
public final EObject entryRuleEAnnotationDecl() throws RecognitionException {
EObject current = null;
@@ -1288,16 +1279,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:674:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:675:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:662:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:663:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEAnnotationDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1385);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1364);
iv_ruleEAnnotationDecl=ruleEAnnotationDecl();
_fsp--;
current =iv_ruleEAnnotationDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1395);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1374);
}
@@ -1315,7 +1306,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEAnnotationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:1: ruleEAnnotationDecl returns [EObject current=null] : ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:670:1: ruleEAnnotationDecl returns [EObject current=null] : ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) ;
public final EObject ruleEAnnotationDecl() throws RecognitionException {
EObject current = null;
@@ -1329,23 +1320,23 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:687:6: ( ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:688:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:675:6: ( ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:688:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:688:2: '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:2: '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
{
- match(input,26,FOLLOW_26_in_ruleEAnnotationDecl1429);
+ match(input,26,FOLLOW_26_in_ruleEAnnotationDecl1408);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getCommercialAtKeyword_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:692:1: (lv_source_1= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:695:6: lv_source_1= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:680:1: (lv_source_1= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:683:6: lv_source_1= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getSourceSTRING_OR_QIDParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1463);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1442);
lv_source_1=ruleSTRING_OR_QID();
_fsp--;
@@ -1365,7 +1356,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:713:2: ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:701:2: ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1374,19 +1365,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:713:3: '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:701:3: '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')'
{
- match(input,27,FOLLOW_27_in_ruleEAnnotationDecl1477);
+ match(input,27,FOLLOW_27_in_ruleEAnnotationDecl1456);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getLeftParenthesisKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:717:1: (lv_details_3= ruleMapEntry )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:720:6: lv_details_3= ruleMapEntry
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:705:1: (lv_details_3= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:708:6: lv_details_3= ruleMapEntry
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getDetailsMapEntryParserRuleCall_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1511);
+ pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1490);
lv_details_3=ruleMapEntry();
_fsp--;
@@ -1406,7 +1397,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:738:2: ( ',' (lv_details_5= ruleMapEntry ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:726:2: ( ',' (lv_details_5= ruleMapEntry ) )*
loop11:
do {
int alt11=2;
@@ -1419,19 +1410,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:738:3: ',' (lv_details_5= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:726:3: ',' (lv_details_5= ruleMapEntry )
{
- match(input,28,FOLLOW_28_in_ruleEAnnotationDecl1525);
+ match(input,28,FOLLOW_28_in_ruleEAnnotationDecl1504);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getCommaKeyword_2_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:742:1: (lv_details_5= ruleMapEntry )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:745:6: lv_details_5= ruleMapEntry
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:730:1: (lv_details_5= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:733:6: lv_details_5= ruleMapEntry
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getDetailsMapEntryParserRuleCall_2_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1559);
+ pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1538);
lv_details_5=ruleMapEntry();
_fsp--;
@@ -1460,7 +1451,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,29,FOLLOW_29_in_ruleEAnnotationDecl1574);
+ match(input,29,FOLLOW_29_in_ruleEAnnotationDecl1553);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getRightParenthesisKeyword_2_3(), null);
@@ -1493,7 +1484,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEClassDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:774:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:762:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ;
public final EObject entryRuleEClassDecl() throws RecognitionException {
EObject current = null;
@@ -1501,16 +1492,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:774:52: (iv_ruleEClassDecl= ruleEClassDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:775:2: iv_ruleEClassDecl= ruleEClassDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:762:52: (iv_ruleEClassDecl= ruleEClassDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:763:2: iv_ruleEClassDecl= ruleEClassDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEClassDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1609);
+ pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1588);
iv_ruleEClassDecl=ruleEClassDecl();
_fsp--;
current =iv_ruleEClassDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1619);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1598);
}
@@ -1528,7 +1519,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEClassDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:782:1: ruleEClassDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:770:1: ruleEClassDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) ;
public final EObject ruleEClassDecl() throws RecognitionException {
EObject current = null;
@@ -1555,13 +1546,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:787:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:788:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:775:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:788:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:788:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:788:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop13:
do {
int alt13=2;
@@ -1574,12 +1565,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt13) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:791:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:779:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1678);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1657);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -1605,7 +1596,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:809:3: (lv_abstract_1= 'abstract' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:3: (lv_abstract_1= 'abstract' )?
int alt14=2;
int LA14_0 = input.LA(1);
@@ -1614,10 +1605,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt14) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:811:6: lv_abstract_1= 'abstract'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:799:6: lv_abstract_1= 'abstract'
{
lv_abstract_1=(Token)input.LT(1);
- match(input,30,FOLLOW_30_in_ruleEClassDecl1704);
+ match(input,30,FOLLOW_30_in_ruleEClassDecl1683);
createLeafNode(grammarAccess.getEClassDeclAccess().getAbstractAbstractKeyword_1_0(), "abstract");
@@ -1639,7 +1630,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:830:3: ( (lv_interface_2= 'interface' ) | 'class' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:3: ( (lv_interface_2= 'interface' ) | 'class' )
int alt15=2;
int LA15_0 = input.LA(1);
@@ -1651,19 +1642,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("830:3: ( (lv_interface_2= 'interface' ) | 'class' )", 15, 0, input);
+ new NoViableAltException("818:3: ( (lv_interface_2= 'interface' ) | 'class' )", 15, 0, input);
throw nvae;
}
switch (alt15) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:830:4: (lv_interface_2= 'interface' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:4: (lv_interface_2= 'interface' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:830:4: (lv_interface_2= 'interface' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:832:6: lv_interface_2= 'interface'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:4: (lv_interface_2= 'interface' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:820:6: lv_interface_2= 'interface'
{
lv_interface_2=(Token)input.LT(1);
- match(input,31,FOLLOW_31_in_ruleEClassDecl1740);
+ match(input,31,FOLLOW_31_in_ruleEClassDecl1719);
createLeafNode(grammarAccess.getEClassDeclAccess().getInterfaceInterfaceKeyword_2_0_0(), "interface");
@@ -1686,9 +1677,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:852:6: 'class'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:840:6: 'class'
{
- match(input,32,FOLLOW_32_in_ruleEClassDecl1768);
+ match(input,32,FOLLOW_32_in_ruleEClassDecl1747);
createLeafNode(grammarAccess.getEClassDeclAccess().getClassKeyword_2_1(), null);
@@ -1698,11 +1689,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:856:2: (lv_name_4= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:858:6: lv_name_4= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:844:2: (lv_name_4= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:846:6: lv_name_4= RULE_ID
{
lv_name_4=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1791);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1770);
createLeafNode(grammarAccess.getEClassDeclAccess().getNameIDTerminalRuleCall_3_0(), "name");
@@ -1721,7 +1712,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:876:2: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:864:2: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )?
int alt17=2;
int LA17_0 = input.LA(1);
@@ -1730,19 +1721,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt17) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:876:3: '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:864:3: '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEClassDecl1809);
+ match(input,33,FOLLOW_33_in_ruleEClassDecl1788);
createLeafNode(grammarAccess.getEClassDeclAccess().getLessThanSignKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:880:1: (lv_eTypeParameters_6= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:6: lv_eTypeParameters_6= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:868:1: (lv_eTypeParameters_6= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:871:6: lv_eTypeParameters_6= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_4_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1843);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1822);
lv_eTypeParameters_6=ruleETypeParameterDecl();
_fsp--;
@@ -1762,7 +1753,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:901:2: ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:889:2: ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )*
loop16:
do {
int alt16=2;
@@ -1775,19 +1766,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt16) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:901:3: ',' (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:889:3: ',' (lv_eTypeParameters_8= ruleETypeParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEClassDecl1857);
+ match(input,28,FOLLOW_28_in_ruleEClassDecl1836);
createLeafNode(grammarAccess.getEClassDeclAccess().getCommaKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:905:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:908:6: lv_eTypeParameters_8= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:893:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:896:6: lv_eTypeParameters_8= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1891);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1870);
lv_eTypeParameters_8=ruleETypeParameterDecl();
_fsp--;
@@ -1816,7 +1807,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEClassDecl1906);
+ match(input,34,FOLLOW_34_in_ruleEClassDecl1885);
createLeafNode(grammarAccess.getEClassDeclAccess().getGreaterThanSignKeyword_4_3(), null);
@@ -1826,7 +1817,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:930:3: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:918:3: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )?
int alt19=2;
int LA19_0 = input.LA(1);
@@ -1835,19 +1826,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt19) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:930:4: 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:918:4: 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
{
- match(input,35,FOLLOW_35_in_ruleEClassDecl1918);
+ match(input,35,FOLLOW_35_in_ruleEClassDecl1897);
createLeafNode(grammarAccess.getEClassDeclAccess().getExtendsKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:934:1: (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:937:6: lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:922:1: (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:925:6: lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEGenericSuperTypesEGenericTypeReferenceDeclParserRuleCall_5_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1952);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1931);
lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -1867,7 +1858,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:955:2: ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:943:2: ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
loop18:
do {
int alt18=2;
@@ -1880,19 +1871,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt18) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:955:3: ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:943:3: ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
{
- match(input,28,FOLLOW_28_in_ruleEClassDecl1966);
+ match(input,28,FOLLOW_28_in_ruleEClassDecl1945);
createLeafNode(grammarAccess.getEClassDeclAccess().getCommaKeyword_5_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:959:1: (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:962:6: lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:947:1: (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:950:6: lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEGenericSuperTypesEGenericTypeReferenceDeclParserRuleCall_5_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2000);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1979);
lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -1927,7 +1918,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:980:6: ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:968:6: ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )?
int alt20=2;
int LA20_0 = input.LA(1);
@@ -1936,19 +1927,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt20) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:980:7: ':' (lv_instanceClassName_15= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:968:7: ':' (lv_instanceClassName_15= ruleSTRING_OR_QID )
{
- match(input,25,FOLLOW_25_in_ruleEClassDecl2018);
+ match(input,25,FOLLOW_25_in_ruleEClassDecl1997);
createLeafNode(grammarAccess.getEClassDeclAccess().getColonKeyword_6_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:984:1: (lv_instanceClassName_15= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:987:6: lv_instanceClassName_15= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:972:1: (lv_instanceClassName_15= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:975:6: lv_instanceClassName_15= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getInstanceClassNameSTRING_OR_QIDParserRuleCall_6_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2052);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2031);
lv_instanceClassName_15=ruleSTRING_OR_QID();
_fsp--;
@@ -1974,26 +1965,26 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleEClassDecl2067);
+ match(input,22,FOLLOW_22_in_ruleEClassDecl2046);
createLeafNode(grammarAccess.getEClassDeclAccess().getLeftCurlyBracketKeyword_7(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1009:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*
loop21:
do {
int alt21=3;
alt21 = dfa21.predict(input);
switch (alt21) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1009:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1009:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1012:6: lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1000:6: lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEStructuralFeaturesEStructuralFeatureDeclParserRuleCall_8_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2102);
+ pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2081);
lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl();
_fsp--;
@@ -2017,15 +2008,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1031:6: (lv_eOperations_18= ruleEOperationDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1019:6: (lv_eOperations_18= ruleEOperationDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1031:6: (lv_eOperations_18= ruleEOperationDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1034:6: lv_eOperations_18= ruleEOperationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1019:6: (lv_eOperations_18= ruleEOperationDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1022:6: lv_eOperations_18= ruleEOperationDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEOperationsEOperationDeclParserRuleCall_8_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2146);
+ pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2125);
lv_eOperations_18=ruleEOperationDecl();
_fsp--;
@@ -2054,7 +2045,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,23,FOLLOW_23_in_ruleEClassDecl2161);
+ match(input,23,FOLLOW_23_in_ruleEClassDecl2140);
createLeafNode(grammarAccess.getEClassDeclAccess().getRightCurlyBracketKeyword_9(), null);
@@ -2081,7 +2072,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEStructuralFeatureDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1063:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1051:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ;
public final EObject entryRuleEStructuralFeatureDecl() throws RecognitionException {
EObject current = null;
@@ -2089,16 +2080,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1063:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1064:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1051:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1052:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEStructuralFeatureDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2194);
+ pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2173);
iv_ruleEStructuralFeatureDecl=ruleEStructuralFeatureDecl();
_fsp--;
current =iv_ruleEStructuralFeatureDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2204);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2183);
}
@@ -2116,7 +2107,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEStructuralFeatureDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1071:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1059:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ;
public final EObject ruleEStructuralFeatureDecl() throws RecognitionException {
EObject current = null;
@@ -2128,20 +2119,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1076:6: ( (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1077:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1064:6: ( (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1077:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
int alt22=2;
alt22 = dfa22.predict(input);
switch (alt22) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1078:5: this_EAttributeDecl_0= ruleEAttributeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1066:5: this_EAttributeDecl_0= ruleEAttributeDecl
{
currentNode=createCompositeNode(grammarAccess.getEStructuralFeatureDeclAccess().getEAttributeDeclParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2251);
+ pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2230);
this_EAttributeDecl_0=ruleEAttributeDecl();
_fsp--;
@@ -2149,19 +2140,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
current = this_EAttributeDecl_0;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getEStructuralFeatureDeclAccess().getEAttributeDeclParserRuleCall_0(), null);
-
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1092:5: this_EReferenceDecl_1= ruleEReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1076:5: this_EReferenceDecl_1= ruleEReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEStructuralFeatureDeclAccess().getEReferenceDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2285);
+ pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2257);
this_EReferenceDecl_1=ruleEReferenceDecl();
_fsp--;
@@ -2169,9 +2157,6 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
current = this_EReferenceDecl_1;
currentNode = currentNode.getParent();
-
- createLeafNode(grammarAccess.getEStructuralFeatureDeclAccess().getEReferenceDeclParserRuleCall_1(), null);
-
}
break;
@@ -2198,7 +2183,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEAttributeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1111:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1091:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ;
public final EObject entryRuleEAttributeDecl() throws RecognitionException {
EObject current = null;
@@ -2206,16 +2191,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1111:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1112:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1091:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1092:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEAttributeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2324);
+ pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2289);
iv_ruleEAttributeDecl=ruleEAttributeDecl();
_fsp--;
current =iv_ruleEAttributeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2334);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2299);
}
@@ -2233,7 +2218,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEAttributeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1119:1: ruleEAttributeDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1099:1: ruleEAttributeDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) ;
public final EObject ruleEAttributeDecl() throws RecognitionException {
EObject current = null;
@@ -2258,13 +2243,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1124:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1125:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1104:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1125:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1125:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1125:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop23:
do {
int alt23=2;
@@ -2277,12 +2262,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt23) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1128:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1108:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2393);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2358);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -2308,7 +2293,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1146:3: ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:3: ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
loop24:
do {
int alt24=9;
@@ -2358,13 +2343,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt24) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1146:4: (lv_iD_1= 'ID' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:4: (lv_iD_1= 'ID' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1146:4: (lv_iD_1= 'ID' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1148:6: lv_iD_1= 'ID'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:4: (lv_iD_1= 'ID' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1128:6: lv_iD_1= 'ID'
{
lv_iD_1=(Token)input.LT(1);
- match(input,36,FOLLOW_36_in_ruleEAttributeDecl2420);
+ match(input,36,FOLLOW_36_in_ruleEAttributeDecl2385);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getIDIDKeyword_1_0_0(), "iD");
@@ -2387,13 +2372,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1168:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1148:6: (lv_unique_2= RULE_BAG )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1168:6: (lv_unique_2= RULE_BAG )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1170:6: lv_unique_2= RULE_BAG
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1148:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1150:6: lv_unique_2= RULE_BAG
{
lv_unique_2=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEAttributeDecl2461);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEAttributeDecl2426);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getUniqueBagTerminalRuleCall_1_1_0(), "unique");
@@ -2416,13 +2401,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1189:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1169:6: (lv_ordered_3= RULE_RANDOM )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1189:6: (lv_ordered_3= RULE_RANDOM )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1191:6: lv_ordered_3= RULE_RANDOM
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1169:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1171:6: lv_ordered_3= RULE_RANDOM
{
lv_ordered_3=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2497);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2462);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getOrderedRandomTerminalRuleCall_1_2_0(), "ordered");
@@ -2445,13 +2430,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1210:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1190:6: (lv_changeable_4= RULE_READONLY )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1210:6: (lv_changeable_4= RULE_READONLY )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1212:6: lv_changeable_4= RULE_READONLY
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1190:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1192:6: lv_changeable_4= RULE_READONLY
{
lv_changeable_4=(Token)input.LT(1);
- match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2533);
+ match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2498);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getChangeableReadonlyTerminalRuleCall_1_3_0(), "changeable");
@@ -2474,13 +2459,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1231:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1211:6: (lv_volatile_5= 'volatile' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1231:6: (lv_volatile_5= 'volatile' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1233:6: lv_volatile_5= 'volatile'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1211:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1213:6: lv_volatile_5= 'volatile'
{
lv_volatile_5=(Token)input.LT(1);
- match(input,37,FOLLOW_37_in_ruleEAttributeDecl2568);
+ match(input,37,FOLLOW_37_in_ruleEAttributeDecl2533);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getVolatileVolatileKeyword_1_4_0(), "volatile");
@@ -2503,13 +2488,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1253:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1233:6: (lv_transient_6= 'transient' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1253:6: (lv_transient_6= 'transient' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1255:6: lv_transient_6= 'transient'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1233:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1235:6: lv_transient_6= 'transient'
{
lv_transient_6=(Token)input.LT(1);
- match(input,38,FOLLOW_38_in_ruleEAttributeDecl2608);
+ match(input,38,FOLLOW_38_in_ruleEAttributeDecl2573);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getTransientTransientKeyword_1_5_0(), "transient");
@@ -2532,13 +2517,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1275:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1255:6: (lv_unsettable_7= 'unsettable' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1275:6: (lv_unsettable_7= 'unsettable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1277:6: lv_unsettable_7= 'unsettable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1255:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1257:6: lv_unsettable_7= 'unsettable'
{
lv_unsettable_7=(Token)input.LT(1);
- match(input,39,FOLLOW_39_in_ruleEAttributeDecl2648);
+ match(input,39,FOLLOW_39_in_ruleEAttributeDecl2613);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getUnsettableUnsettableKeyword_1_6_0(), "unsettable");
@@ -2561,13 +2546,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 8 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1297:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1277:6: (lv_derived_8= 'derived' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1297:6: (lv_derived_8= 'derived' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1299:6: lv_derived_8= 'derived'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1277:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1279:6: lv_derived_8= 'derived'
{
lv_derived_8=(Token)input.LT(1);
- match(input,40,FOLLOW_40_in_ruleEAttributeDecl2688);
+ match(input,40,FOLLOW_40_in_ruleEAttributeDecl2653);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getDerivedDerivedKeyword_1_7_0(), "derived");
@@ -2595,17 +2580,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,41,FOLLOW_41_in_ruleEAttributeDecl2712);
+ match(input,41,FOLLOW_41_in_ruleEAttributeDecl2677);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getAttrKeyword_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1322:1: (lv_eGenericType_10= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1325:6: lv_eGenericType_10= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1302:1: (lv_eGenericType_10= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1305:6: lv_eGenericType_10= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2746);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2711);
lv_eGenericType_10=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -2625,7 +2610,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1343:2: ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1323:2: ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )?
int alt26=2;
int LA26_0 = input.LA(1);
@@ -2634,17 +2619,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt26) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1343:3: '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1323:3: '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']'
{
- match(input,42,FOLLOW_42_in_ruleEAttributeDecl2760);
+ match(input,42,FOLLOW_42_in_ruleEAttributeDecl2725);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getLeftSquareBracketKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:1: (lv_lowerBound_12= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1349:6: lv_lowerBound_12= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1327:1: (lv_lowerBound_12= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1329:6: lv_lowerBound_12= RULE_INT
{
lv_lowerBound_12=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEAttributeDecl2782);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEAttributeDecl2747);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getLowerBoundINTTerminalRuleCall_4_1_0(), "lowerBound");
@@ -2663,7 +2648,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1367:2: ( '..' (lv_upperBound_14= ruleSINT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:2: ( '..' (lv_upperBound_14= ruleSINT ) )?
int alt25=2;
int LA25_0 = input.LA(1);
@@ -2672,19 +2657,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt25) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1367:3: '..' (lv_upperBound_14= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:3: '..' (lv_upperBound_14= ruleSINT )
{
- match(input,43,FOLLOW_43_in_ruleEAttributeDecl2800);
+ match(input,43,FOLLOW_43_in_ruleEAttributeDecl2765);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getFullStopFullStopKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1371:1: (lv_upperBound_14= ruleSINT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1374:6: lv_upperBound_14= ruleSINT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1351:1: (lv_upperBound_14= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1354:6: lv_upperBound_14= ruleSINT
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getUpperBoundSINTParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_ruleEAttributeDecl2834);
+ pushFollow(FOLLOW_ruleSINT_in_ruleEAttributeDecl2799);
lv_upperBound_14=ruleSINT();
_fsp--;
@@ -2710,7 +2695,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,44,FOLLOW_44_in_ruleEAttributeDecl2849);
+ match(input,44,FOLLOW_44_in_ruleEAttributeDecl2814);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getRightSquareBracketKeyword_4_3(), null);
@@ -2720,11 +2705,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:3: (lv_name_16= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1398:6: lv_name_16= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1376:3: (lv_name_16= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1378:6: lv_name_16= RULE_ID
{
lv_name_16=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAttributeDecl2873);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAttributeDecl2838);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getNameIDTerminalRuleCall_5_0(), "name");
@@ -2743,7 +2728,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1416:2: ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:2: ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )?
int alt27=2;
int LA27_0 = input.LA(1);
@@ -2752,17 +2737,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt27) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1416:3: '=' (lv_defaultValueLiteral_18= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:3: '=' (lv_defaultValueLiteral_18= RULE_STRING )
{
- match(input,17,FOLLOW_17_in_ruleEAttributeDecl2891);
+ match(input,17,FOLLOW_17_in_ruleEAttributeDecl2856);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getEqualsSignKeyword_6_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1420:1: (lv_defaultValueLiteral_18= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1422:6: lv_defaultValueLiteral_18= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1400:1: (lv_defaultValueLiteral_18= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1402:6: lv_defaultValueLiteral_18= RULE_STRING
{
lv_defaultValueLiteral_18=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAttributeDecl2913);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAttributeDecl2878);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_6_1_0(), "defaultValueLiteral");
@@ -2787,7 +2772,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEAttributeDecl2932);
+ match(input,18,FOLLOW_18_in_ruleEAttributeDecl2897);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getSemicolonKeyword_7(), null);
@@ -2814,7 +2799,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1451:1: entryRuleEReferenceDecl returns [EObject current=null] : iv_ruleEReferenceDecl= ruleEReferenceDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1431:1: entryRuleEReferenceDecl returns [EObject current=null] : iv_ruleEReferenceDecl= ruleEReferenceDecl EOF ;
public final EObject entryRuleEReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -2822,16 +2807,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1451:56: (iv_ruleEReferenceDecl= ruleEReferenceDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1452:2: iv_ruleEReferenceDecl= ruleEReferenceDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1431:56: (iv_ruleEReferenceDecl= ruleEReferenceDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1432:2: iv_ruleEReferenceDecl= ruleEReferenceDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEReferenceDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2965);
+ pushFollow(FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2930);
iv_ruleEReferenceDecl=ruleEReferenceDecl();
_fsp--;
current =iv_ruleEReferenceDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEReferenceDecl2975);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEReferenceDecl2940);
}
@@ -2849,7 +2834,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1459:1: ruleEReferenceDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1439:1: ruleEReferenceDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) ;
public final EObject ruleEReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -2874,13 +2859,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1464:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1465:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1444:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1465:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1465:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1465:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop28:
do {
int alt28=2;
@@ -2893,12 +2878,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt28) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1468:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1448:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl3034);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2999);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -2924,7 +2909,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1486:3: ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:3: ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
loop29:
do {
int alt29=9;
@@ -2974,13 +2959,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt29) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1486:4: (lv_resolveProxies_1= RULE_LOCAL )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:4: (lv_resolveProxies_1= RULE_LOCAL )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1486:4: (lv_resolveProxies_1= RULE_LOCAL )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1488:6: lv_resolveProxies_1= RULE_LOCAL
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:4: (lv_resolveProxies_1= RULE_LOCAL )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1468:6: lv_resolveProxies_1= RULE_LOCAL
{
lv_resolveProxies_1=(Token)input.LT(1);
- match(input,RULE_LOCAL,FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3062);
+ match(input,RULE_LOCAL,FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3027);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getResolveProxiesLocalTerminalRuleCall_1_0_0(), "resolveProxies");
@@ -3003,13 +2988,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1507:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1487:6: (lv_unique_2= RULE_BAG )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1507:6: (lv_unique_2= RULE_BAG )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1509:6: lv_unique_2= RULE_BAG
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1487:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1489:6: lv_unique_2= RULE_BAG
{
lv_unique_2=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEReferenceDecl3098);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEReferenceDecl3063);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getUniqueBagTerminalRuleCall_1_1_0(), "unique");
@@ -3032,13 +3017,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1528:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1508:6: (lv_ordered_3= RULE_RANDOM )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1528:6: (lv_ordered_3= RULE_RANDOM )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1530:6: lv_ordered_3= RULE_RANDOM
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1508:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1510:6: lv_ordered_3= RULE_RANDOM
{
lv_ordered_3=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3134);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3099);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getOrderedRandomTerminalRuleCall_1_2_0(), "ordered");
@@ -3061,13 +3046,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1549:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1529:6: (lv_changeable_4= RULE_READONLY )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1549:6: (lv_changeable_4= RULE_READONLY )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1551:6: lv_changeable_4= RULE_READONLY
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1529:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1531:6: lv_changeable_4= RULE_READONLY
{
lv_changeable_4=(Token)input.LT(1);
- match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3170);
+ match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3135);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getChangeableReadonlyTerminalRuleCall_1_3_0(), "changeable");
@@ -3090,13 +3075,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1570:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1550:6: (lv_volatile_5= 'volatile' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1570:6: (lv_volatile_5= 'volatile' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1572:6: lv_volatile_5= 'volatile'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1550:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1552:6: lv_volatile_5= 'volatile'
{
lv_volatile_5=(Token)input.LT(1);
- match(input,37,FOLLOW_37_in_ruleEReferenceDecl3205);
+ match(input,37,FOLLOW_37_in_ruleEReferenceDecl3170);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getVolatileVolatileKeyword_1_4_0(), "volatile");
@@ -3119,13 +3104,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1592:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1572:6: (lv_transient_6= 'transient' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1592:6: (lv_transient_6= 'transient' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1594:6: lv_transient_6= 'transient'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1572:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1574:6: lv_transient_6= 'transient'
{
lv_transient_6=(Token)input.LT(1);
- match(input,38,FOLLOW_38_in_ruleEReferenceDecl3245);
+ match(input,38,FOLLOW_38_in_ruleEReferenceDecl3210);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getTransientTransientKeyword_1_5_0(), "transient");
@@ -3148,13 +3133,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1614:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1594:6: (lv_unsettable_7= 'unsettable' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1614:6: (lv_unsettable_7= 'unsettable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1616:6: lv_unsettable_7= 'unsettable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1594:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1596:6: lv_unsettable_7= 'unsettable'
{
lv_unsettable_7=(Token)input.LT(1);
- match(input,39,FOLLOW_39_in_ruleEReferenceDecl3285);
+ match(input,39,FOLLOW_39_in_ruleEReferenceDecl3250);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getUnsettableUnsettableKeyword_1_6_0(), "unsettable");
@@ -3177,13 +3162,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 8 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1636:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1616:6: (lv_derived_8= 'derived' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1636:6: (lv_derived_8= 'derived' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1638:6: lv_derived_8= 'derived'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1616:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1618:6: lv_derived_8= 'derived'
{
lv_derived_8=(Token)input.LT(1);
- match(input,40,FOLLOW_40_in_ruleEReferenceDecl3325);
+ match(input,40,FOLLOW_40_in_ruleEReferenceDecl3290);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getDerivedDerivedKeyword_1_7_0(), "derived");
@@ -3211,7 +3196,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1657:4: ( (lv_containment_9= 'val' ) | 'ref' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:4: ( (lv_containment_9= 'val' ) | 'ref' )
int alt30=2;
int LA30_0 = input.LA(1);
@@ -3223,19 +3208,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("1657:4: ( (lv_containment_9= 'val' ) | 'ref' )", 30, 0, input);
+ new NoViableAltException("1637:4: ( (lv_containment_9= 'val' ) | 'ref' )", 30, 0, input);
throw nvae;
}
switch (alt30) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1657:5: (lv_containment_9= 'val' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:5: (lv_containment_9= 'val' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1657:5: (lv_containment_9= 'val' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1659:6: lv_containment_9= 'val'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:5: (lv_containment_9= 'val' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1639:6: lv_containment_9= 'val'
{
lv_containment_9=(Token)input.LT(1);
- match(input,45,FOLLOW_45_in_ruleEReferenceDecl3362);
+ match(input,45,FOLLOW_45_in_ruleEReferenceDecl3327);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getContainmentValKeyword_2_0_0(), "containment");
@@ -3258,9 +3243,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1679:6: 'ref'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1659:6: 'ref'
{
- match(input,46,FOLLOW_46_in_ruleEReferenceDecl3390);
+ match(input,46,FOLLOW_46_in_ruleEReferenceDecl3355);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getRefKeyword_2_1(), null);
@@ -3270,13 +3255,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1683:2: (lv_eGenericType_11= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1686:6: lv_eGenericType_11= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1663:2: (lv_eGenericType_11= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1666:6: lv_eGenericType_11= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3425);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3390);
lv_eGenericType_11=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -3296,7 +3281,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1704:2: ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1684:2: ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )?
int alt32=2;
int LA32_0 = input.LA(1);
@@ -3305,17 +3290,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt32) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1704:3: '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1684:3: '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']'
{
- match(input,42,FOLLOW_42_in_ruleEReferenceDecl3439);
+ match(input,42,FOLLOW_42_in_ruleEReferenceDecl3404);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getLeftSquareBracketKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:1: (lv_lowerBound_13= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1710:6: lv_lowerBound_13= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1688:1: (lv_lowerBound_13= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1690:6: lv_lowerBound_13= RULE_INT
{
lv_lowerBound_13=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEReferenceDecl3461);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEReferenceDecl3426);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getLowerBoundINTTerminalRuleCall_4_1_0(), "lowerBound");
@@ -3334,7 +3319,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1728:2: ( '..' (lv_upperBound_15= ruleSINT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:2: ( '..' (lv_upperBound_15= ruleSINT ) )?
int alt31=2;
int LA31_0 = input.LA(1);
@@ -3343,19 +3328,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt31) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1728:3: '..' (lv_upperBound_15= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:3: '..' (lv_upperBound_15= ruleSINT )
{
- match(input,43,FOLLOW_43_in_ruleEReferenceDecl3479);
+ match(input,43,FOLLOW_43_in_ruleEReferenceDecl3444);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getFullStopFullStopKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1732:1: (lv_upperBound_15= ruleSINT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1735:6: lv_upperBound_15= ruleSINT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1712:1: (lv_upperBound_15= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1715:6: lv_upperBound_15= ruleSINT
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getUpperBoundSINTParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_ruleEReferenceDecl3513);
+ pushFollow(FOLLOW_ruleSINT_in_ruleEReferenceDecl3478);
lv_upperBound_15=ruleSINT();
_fsp--;
@@ -3381,7 +3366,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,44,FOLLOW_44_in_ruleEReferenceDecl3528);
+ match(input,44,FOLLOW_44_in_ruleEReferenceDecl3493);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getRightSquareBracketKeyword_4_3(), null);
@@ -3391,7 +3376,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1757:3: ( '#' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1737:3: ( '#' ( RULE_ID ) )?
int alt33=2;
int LA33_0 = input.LA(1);
@@ -3400,14 +3385,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt33) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1757:4: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1737:4: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEReferenceDecl3540);
+ match(input,47,FOLLOW_47_in_ruleEReferenceDecl3505);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getNumberSignKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1761:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1764:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1741:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1744:3: RULE_ID
{
if (current==null) {
@@ -3415,7 +3400,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3562);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3527);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getEOppositeEReferenceCrossReference_5_1_0(), "eOpposite");
@@ -3428,11 +3413,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1777:4: (lv_name_19= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1779:6: lv_name_19= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1757:4: (lv_name_19= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1759:6: lv_name_19= RULE_ID
{
lv_name_19=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3589);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3554);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getNameIDTerminalRuleCall_6_0(), "name");
@@ -3451,7 +3436,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEReferenceDecl3606);
+ match(input,18,FOLLOW_18_in_ruleEReferenceDecl3571);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getSemicolonKeyword_7(), null);
@@ -3478,7 +3463,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEEnumDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1808:1: entryRuleEEnumDecl returns [EObject current=null] : iv_ruleEEnumDecl= ruleEEnumDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1788:1: entryRuleEEnumDecl returns [EObject current=null] : iv_ruleEEnumDecl= ruleEEnumDecl EOF ;
public final EObject entryRuleEEnumDecl() throws RecognitionException {
EObject current = null;
@@ -3486,16 +3471,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1808:51: (iv_ruleEEnumDecl= ruleEEnumDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1809:2: iv_ruleEEnumDecl= ruleEEnumDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1788:51: (iv_ruleEEnumDecl= ruleEEnumDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1789:2: iv_ruleEEnumDecl= ruleEEnumDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEEnumDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3639);
+ pushFollow(FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3604);
iv_ruleEEnumDecl=ruleEEnumDecl();
_fsp--;
current =iv_ruleEEnumDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumDecl3649);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumDecl3614);
}
@@ -3513,7 +3498,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEEnumDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1816:1: ruleEEnumDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1796:1: ruleEEnumDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) ;
public final EObject ruleEEnumDecl() throws RecognitionException {
EObject current = null;
@@ -3526,13 +3511,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1821:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1822:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1801:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1822:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1822:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1822:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop34:
do {
int alt34=2;
@@ -3545,12 +3530,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt34) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1825:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1805:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3708);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3673);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -3576,15 +3561,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,48,FOLLOW_48_in_ruleEEnumDecl3722);
+ match(input,48,FOLLOW_48_in_ruleEEnumDecl3687);
createLeafNode(grammarAccess.getEEnumDeclAccess().getEnumKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1847:1: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1849:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1827:1: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1829:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumDecl3744);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumDecl3709);
createLeafNode(grammarAccess.getEEnumDeclAccess().getNameIDTerminalRuleCall_2_0(), "name");
@@ -3603,11 +3588,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleEEnumDecl3761);
+ match(input,22,FOLLOW_22_in_ruleEEnumDecl3726);
createLeafNode(grammarAccess.getEEnumDeclAccess().getLeftCurlyBracketKeyword_3(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1871:1: (lv_eLiterals_4= ruleEEnumLiteralDecl )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1851:1: (lv_eLiterals_4= ruleEEnumLiteralDecl )+
int cnt35=0;
loop35:
do {
@@ -3621,12 +3606,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt35) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1874:6: lv_eLiterals_4= ruleEEnumLiteralDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1854:6: lv_eLiterals_4= ruleEEnumLiteralDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumDeclAccess().getELiteralsEEnumLiteralDeclParserRuleCall_4_0(), currentNode);
- pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3795);
+ pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3760);
lv_eLiterals_4=ruleEEnumLiteralDecl();
_fsp--;
@@ -3656,7 +3641,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
cnt35++;
} while (true);
- match(input,23,FOLLOW_23_in_ruleEEnumDecl3809);
+ match(input,23,FOLLOW_23_in_ruleEEnumDecl3774);
createLeafNode(grammarAccess.getEEnumDeclAccess().getRightCurlyBracketKeyword_5(), null);
@@ -3683,7 +3668,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEEnumLiteralDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1903:1: entryRuleEEnumLiteralDecl returns [EObject current=null] : iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1883:1: entryRuleEEnumLiteralDecl returns [EObject current=null] : iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF ;
public final EObject entryRuleEEnumLiteralDecl() throws RecognitionException {
EObject current = null;
@@ -3691,16 +3676,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1903:58: (iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1904:2: iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1883:58: (iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1884:2: iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEEnumLiteralDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3842);
+ pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3807);
iv_ruleEEnumLiteralDecl=ruleEEnumLiteralDecl();
_fsp--;
current =iv_ruleEEnumLiteralDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3852);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3817);
}
@@ -3718,7 +3703,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEEnumLiteralDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1911:1: ruleEEnumLiteralDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1891:1: ruleEEnumLiteralDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) ;
public final EObject ruleEEnumLiteralDecl() throws RecognitionException {
EObject current = null;
@@ -3731,13 +3716,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1916:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1917:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1896:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1917:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1917:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1917:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop36:
do {
int alt36=2;
@@ -3750,12 +3735,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt36) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1920:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1900:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumLiteralDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3911);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3876);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -3781,11 +3766,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:3: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1940:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1918:3: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1920:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3938);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3903);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -3804,7 +3789,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1958:2: ( '=' (lv_value_3= RULE_INT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:2: ( '=' (lv_value_3= RULE_INT ) )?
int alt37=2;
int LA37_0 = input.LA(1);
@@ -3813,17 +3798,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt37) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1958:3: '=' (lv_value_3= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:3: '=' (lv_value_3= RULE_INT )
{
- match(input,17,FOLLOW_17_in_ruleEEnumLiteralDecl3956);
+ match(input,17,FOLLOW_17_in_ruleEEnumLiteralDecl3921);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getEqualsSignKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1962:1: (lv_value_3= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1964:6: lv_value_3= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1942:1: (lv_value_3= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1944:6: lv_value_3= RULE_INT
{
lv_value_3=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3978);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3943);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getValueINTTerminalRuleCall_2_1_0(), "value");
@@ -3848,7 +3833,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1982:4: (lv_literal_4= RULE_STRING )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1962:4: (lv_literal_4= RULE_STRING )?
int alt38=2;
int LA38_0 = input.LA(1);
@@ -3857,10 +3842,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt38) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1984:6: lv_literal_4= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1964:6: lv_literal_4= RULE_STRING
{
lv_literal_4=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl4010);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3975);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getLiteralSTRINGTerminalRuleCall_3_0(), "literal");
@@ -3882,7 +3867,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEEnumLiteralDecl4028);
+ match(input,18,FOLLOW_18_in_ruleEEnumLiteralDecl3993);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getSemicolonKeyword_4(), null);
@@ -3909,7 +3894,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleETypeParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2013:1: entryRuleETypeParameterDecl returns [EObject current=null] : iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1993:1: entryRuleETypeParameterDecl returns [EObject current=null] : iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF ;
public final EObject entryRuleETypeParameterDecl() throws RecognitionException {
EObject current = null;
@@ -3917,16 +3902,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2013:60: (iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2014:2: iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1993:60: (iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1994:2: iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getETypeParameterDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4061);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4026);
iv_ruleETypeParameterDecl=ruleETypeParameterDecl();
_fsp--;
current =iv_ruleETypeParameterDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleETypeParameterDecl4071);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleETypeParameterDecl4036);
}
@@ -3944,7 +3929,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleETypeParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2021:1: ruleETypeParameterDecl returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2001:1: ruleETypeParameterDecl returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) ;
public final EObject ruleETypeParameterDecl() throws RecognitionException {
EObject current = null;
@@ -3955,17 +3940,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2026:6: ( ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2006:6: ( ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:2: (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:2: (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:2: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2029:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:2: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2009:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleETypeParameterDecl4118);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleETypeParameterDecl4083);
createLeafNode(grammarAccess.getETypeParameterDeclAccess().getNameIDTerminalRuleCall_0_0(), "name");
@@ -3984,7 +3969,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2047:2: ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:2: ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
int alt39=2;
int LA39_0 = input.LA(1);
@@ -3993,19 +3978,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt39) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2047:3: 'extends' (lv_eBounds_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:3: 'extends' (lv_eBounds_2= ruleEGenericTypeDecl )
{
- match(input,35,FOLLOW_35_in_ruleETypeParameterDecl4136);
+ match(input,35,FOLLOW_35_in_ruleETypeParameterDecl4101);
createLeafNode(grammarAccess.getETypeParameterDeclAccess().getExtendsKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2051:1: (lv_eBounds_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2054:6: lv_eBounds_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2031:1: (lv_eBounds_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2034:6: lv_eBounds_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getETypeParameterDeclAccess().getEBoundsEGenericTypeDeclParserRuleCall_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4170);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4135);
lv_eBounds_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4054,7 +4039,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEGenericTypeReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2079:1: entryRuleEGenericTypeReferenceDecl returns [EObject current=null] : iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2059:1: entryRuleEGenericTypeReferenceDecl returns [EObject current=null] : iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF ;
public final EObject entryRuleEGenericTypeReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -4062,16 +4047,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2079:67: (iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2080:2: iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2059:67: (iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2060:2: iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4209);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4174);
iv_ruleEGenericTypeReferenceDecl=ruleEGenericTypeReferenceDecl();
_fsp--;
current =iv_ruleEGenericTypeReferenceDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4219);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4184);
}
@@ -4089,7 +4074,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEGenericTypeReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2087:1: ruleEGenericTypeReferenceDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2067:1: ruleEGenericTypeReferenceDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) ;
public final EObject ruleEGenericTypeReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -4101,10 +4086,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2092:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2072:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
int alt42=2;
int LA42_0 = input.LA(1);
@@ -4116,19 +4101,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2093:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )", 42, 0, input);
+ new NoViableAltException("2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )", 42, 0, input);
throw nvae;
}
switch (alt42) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:3: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2096:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2076:3: RULE_ID
{
if (current==null) {
@@ -4136,14 +4121,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4267);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4232);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getEClassifierEClassifierCrossReference_0_0_0(), "eClassifier");
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2109:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2089:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
int alt41=2;
int LA41_0 = input.LA(1);
@@ -4152,19 +4137,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt41) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2109:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2089:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEGenericTypeReferenceDecl4280);
+ match(input,33,FOLLOW_33_in_ruleEGenericTypeReferenceDecl4245);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getLessThanSignKeyword_0_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2113:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2116:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2096:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4314);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4279);
lv_eTypeArguments_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4184,7 +4169,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2134:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2114:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
loop40:
do {
int alt40=2;
@@ -4197,19 +4182,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt40) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2134:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2114:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
{
- match(input,28,FOLLOW_28_in_ruleEGenericTypeReferenceDecl4328);
+ match(input,28,FOLLOW_28_in_ruleEGenericTypeReferenceDecl4293);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getCommaKeyword_0_1_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2138:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2141:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2118:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2121:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4362);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4327);
lv_eTypeArguments_4=ruleEGenericTypeDecl();
_fsp--;
@@ -4238,7 +4223,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEGenericTypeReferenceDecl4377);
+ match(input,34,FOLLOW_34_in_ruleEGenericTypeReferenceDecl4342);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getGreaterThanSignKeyword_0_1_3(), null);
@@ -4255,17 +4240,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2164:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:6: ( '#' ( RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2164:6: ( '#' ( RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2164:7: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:7: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEGenericTypeReferenceDecl4396);
+ match(input,47,FOLLOW_47_in_ruleEGenericTypeReferenceDecl4361);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getNumberSignKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2168:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2171:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2148:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2151:3: RULE_ID
{
if (current==null) {
@@ -4273,7 +4258,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4418);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4383);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeParameterETypeParameterCrossReference_1_1_0(), "eTypeParameter");
@@ -4309,7 +4294,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEGenericTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2191:1: entryRuleEGenericTypeDecl returns [EObject current=null] : iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2171:1: entryRuleEGenericTypeDecl returns [EObject current=null] : iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF ;
public final EObject entryRuleEGenericTypeDecl() throws RecognitionException {
EObject current = null;
@@ -4317,16 +4302,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2191:58: (iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2192:2: iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2171:58: (iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2172:2: iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEGenericTypeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4455);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4420);
iv_ruleEGenericTypeDecl=ruleEGenericTypeDecl();
_fsp--;
current =iv_ruleEGenericTypeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeDecl4465);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeDecl4430);
}
@@ -4344,7 +4329,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEGenericTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2199:1: ruleEGenericTypeDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2179:1: ruleEGenericTypeDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) ;
public final EObject ruleEGenericTypeDecl() throws RecognitionException {
EObject current = null;
@@ -4360,10 +4345,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2204:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2184:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
int alt46=3;
switch ( input.LA(1) ) {
case RULE_ID:
@@ -4383,20 +4368,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
break;
default:
NoViableAltException nvae =
- new NoViableAltException("2205:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )", 46, 0, input);
+ new NoViableAltException("2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )", 46, 0, input);
throw nvae;
}
switch (alt46) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:3: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2208:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2188:3: RULE_ID
{
if (current==null) {
@@ -4404,14 +4389,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4513);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4478);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getEClassifierEClassifierCrossReference_0_0_0(), "eClassifier");
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2221:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2201:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
int alt44=2;
int LA44_0 = input.LA(1);
@@ -4420,19 +4405,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt44) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2221:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2201:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEGenericTypeDecl4526);
+ match(input,33,FOLLOW_33_in_ruleEGenericTypeDecl4491);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getLessThanSignKeyword_0_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2225:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2228:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2208:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4560);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4525);
lv_eTypeArguments_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4452,7 +4437,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2246:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2226:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
loop43:
do {
int alt43=2;
@@ -4465,19 +4450,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt43) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2246:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2226:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
{
- match(input,28,FOLLOW_28_in_ruleEGenericTypeDecl4574);
+ match(input,28,FOLLOW_28_in_ruleEGenericTypeDecl4539);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getCommaKeyword_0_1_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2250:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2253:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2230:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2233:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4608);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4573);
lv_eTypeArguments_4=ruleEGenericTypeDecl();
_fsp--;
@@ -4506,7 +4491,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEGenericTypeDecl4623);
+ match(input,34,FOLLOW_34_in_ruleEGenericTypeDecl4588);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getGreaterThanSignKeyword_0_1_3(), null);
@@ -4523,17 +4508,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2276:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:6: ( '#' ( RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2276:6: ( '#' ( RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2276:7: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:7: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEGenericTypeDecl4642);
+ match(input,47,FOLLOW_47_in_ruleEGenericTypeDecl4607);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getNumberSignKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2280:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2283:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2260:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2263:3: RULE_ID
{
if (current==null) {
@@ -4541,7 +4526,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4664);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4629);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getETypeParameterETypeParameterCrossReference_1_1_0(), "eTypeParameter");
@@ -4555,16 +4540,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2297:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2297:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2297:7: '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:7: '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
{
- match(input,49,FOLLOW_49_in_ruleEGenericTypeDecl4684);
+ match(input,49,FOLLOW_49_in_ruleEGenericTypeDecl4649);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getQuestionMarkKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2301:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
int alt45=2;
int LA45_0 = input.LA(1);
@@ -4576,28 +4561,28 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2301:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )", 45, 0, input);
+ new NoViableAltException("2281:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )", 45, 0, input);
throw nvae;
}
switch (alt45) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2301:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2301:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2301:3: 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:3: 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl )
{
- match(input,35,FOLLOW_35_in_ruleEGenericTypeDecl4695);
+ match(input,35,FOLLOW_35_in_ruleEGenericTypeDecl4660);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getExtendsKeyword_2_1_0_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2305:1: (lv_eUpperBound_10= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2308:6: lv_eUpperBound_10= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2285:1: (lv_eUpperBound_10= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2288:6: lv_eUpperBound_10= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getEUpperBoundEGenericTypeDeclParserRuleCall_2_1_0_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4729);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4694);
lv_eUpperBound_10=ruleEGenericTypeDecl();
_fsp--;
@@ -4624,22 +4609,22 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2327:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2327:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2327:7: 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:7: 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl )
{
- match(input,50,FOLLOW_50_in_ruleEGenericTypeDecl4750);
+ match(input,50,FOLLOW_50_in_ruleEGenericTypeDecl4715);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getSuperKeyword_2_1_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2331:1: (lv_eLowerBound_12= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2334:6: lv_eLowerBound_12= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2311:1: (lv_eLowerBound_12= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2314:6: lv_eLowerBound_12= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getELowerBoundEGenericTypeDeclParserRuleCall_2_1_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4784);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4749);
lv_eLowerBound_12=ruleEGenericTypeDecl();
_fsp--;
@@ -4697,7 +4682,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEOperationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2359:1: entryRuleEOperationDecl returns [EObject current=null] : iv_ruleEOperationDecl= ruleEOperationDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2339:1: entryRuleEOperationDecl returns [EObject current=null] : iv_ruleEOperationDecl= ruleEOperationDecl EOF ;
public final EObject entryRuleEOperationDecl() throws RecognitionException {
EObject current = null;
@@ -4705,16 +4690,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2359:56: (iv_ruleEOperationDecl= ruleEOperationDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2360:2: iv_ruleEOperationDecl= ruleEOperationDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2339:56: (iv_ruleEOperationDecl= ruleEOperationDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2340:2: iv_ruleEOperationDecl= ruleEOperationDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEOperationDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4824);
+ pushFollow(FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4789);
iv_ruleEOperationDecl=ruleEOperationDecl();
_fsp--;
current =iv_ruleEOperationDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEOperationDecl4834);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEOperationDecl4799);
}
@@ -4732,7 +4717,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEOperationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2367:1: ruleEOperationDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2347:1: ruleEOperationDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) ;
public final EObject ruleEOperationDecl() throws RecognitionException {
EObject current = null;
@@ -4759,13 +4744,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2372:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2373:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2352:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2373:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2373:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2373:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop47:
do {
int alt47=2;
@@ -4778,12 +4763,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt47) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2376:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2356:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4893);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4858);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -4809,7 +4794,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2394:3: ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:3: ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )*
loop48:
do {
int alt48=3;
@@ -4825,13 +4810,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt48) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2394:4: (lv_unique_1= 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:4: (lv_unique_1= 'bag' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2394:4: (lv_unique_1= 'bag' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2396:6: lv_unique_1= 'bag'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:4: (lv_unique_1= 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2376:6: lv_unique_1= 'bag'
{
lv_unique_1=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEOperationDecl4920);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEOperationDecl4885);
createLeafNode(grammarAccess.getEOperationDeclAccess().getUniqueBagKeyword_1_0_0(), "unique");
@@ -4854,13 +4839,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2416:6: (lv_ordered_2= 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2396:6: (lv_ordered_2= 'random' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2416:6: (lv_ordered_2= 'random' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2418:6: lv_ordered_2= 'random'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2396:6: (lv_ordered_2= 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2398:6: lv_ordered_2= 'random'
{
lv_ordered_2=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4960);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4925);
createLeafNode(grammarAccess.getEOperationDeclAccess().getOrderedRandomKeyword_1_1_0(), "ordered");
@@ -4888,11 +4873,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,51,FOLLOW_51_in_ruleEOperationDecl4984);
+ match(input,51,FOLLOW_51_in_ruleEOperationDecl4949);
createLeafNode(grammarAccess.getEOperationDeclAccess().getOpKeyword_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2441:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )
int alt49=2;
int LA49_0 = input.LA(1);
@@ -4904,21 +4889,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2441:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )", 49, 0, input);
+ new NoViableAltException("2421:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )", 49, 0, input);
throw nvae;
}
switch (alt49) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2441:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2441:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2444:6: lv_eGenericType_4= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2424:6: lv_eGenericType_4= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5019);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4984);
lv_eGenericType_4=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -4942,9 +4927,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2463:6: 'void'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2443:6: 'void'
{
- match(input,52,FOLLOW_52_in_ruleEOperationDecl5038);
+ match(input,52,FOLLOW_52_in_ruleEOperationDecl5003);
createLeafNode(grammarAccess.getEOperationDeclAccess().getVoidKeyword_3_1(), null);
@@ -4954,11 +4939,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:2: (lv_name_6= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2469:6: lv_name_6= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2447:2: (lv_name_6= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2449:6: lv_name_6= RULE_ID
{
lv_name_6=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEOperationDecl5061);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEOperationDecl5026);
createLeafNode(grammarAccess.getEOperationDeclAccess().getNameIDTerminalRuleCall_4_0(), "name");
@@ -4977,7 +4962,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2487:2: ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:2: ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )?
int alt51=2;
int LA51_0 = input.LA(1);
@@ -4986,19 +4971,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt51) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2487:3: '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:3: '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEOperationDecl5079);
+ match(input,33,FOLLOW_33_in_ruleEOperationDecl5044);
createLeafNode(grammarAccess.getEOperationDeclAccess().getLessThanSignKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2491:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2494:6: lv_eTypeParameters_8= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2471:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2474:6: lv_eTypeParameters_8= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_5_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5113);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5078);
lv_eTypeParameters_8=ruleETypeParameterDecl();
_fsp--;
@@ -5018,7 +5003,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2512:2: ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2492:2: ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )*
loop50:
do {
int alt50=2;
@@ -5031,19 +5016,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt50) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2512:3: ',' (lv_eTypeParameters_10= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2492:3: ',' (lv_eTypeParameters_10= ruleETypeParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5127);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5092);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_5_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2516:1: (lv_eTypeParameters_10= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2519:6: lv_eTypeParameters_10= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2496:1: (lv_eTypeParameters_10= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2499:6: lv_eTypeParameters_10= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_5_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5161);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5126);
lv_eTypeParameters_10=ruleETypeParameterDecl();
_fsp--;
@@ -5072,7 +5057,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEOperationDecl5176);
+ match(input,34,FOLLOW_34_in_ruleEOperationDecl5141);
createLeafNode(grammarAccess.getEOperationDeclAccess().getGreaterThanSignKeyword_5_3(), null);
@@ -5082,11 +5067,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,27,FOLLOW_27_in_ruleEOperationDecl5187);
+ match(input,27,FOLLOW_27_in_ruleEOperationDecl5152);
createLeafNode(grammarAccess.getEOperationDeclAccess().getLeftParenthesisKeyword_6(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2545:1: ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:1: ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )?
int alt53=2;
int LA53_0 = input.LA(1);
@@ -5095,15 +5080,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt53) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2545:2: (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:2: (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2545:2: (lv_eParameters_13= ruleEParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2548:6: lv_eParameters_13= ruleEParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:2: (lv_eParameters_13= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2528:6: lv_eParameters_13= ruleEParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEParametersEParameterDeclParserRuleCall_7_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5222);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5187);
lv_eParameters_13=ruleEParameterDecl();
_fsp--;
@@ -5123,7 +5108,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2566:2: ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2546:2: ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
loop52:
do {
int alt52=2;
@@ -5136,19 +5121,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt52) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2566:3: ',' (lv_eParameters_15= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2546:3: ',' (lv_eParameters_15= ruleEParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5236);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5201);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_7_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2570:1: (lv_eParameters_15= ruleEParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2573:6: lv_eParameters_15= ruleEParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2550:1: (lv_eParameters_15= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2553:6: lv_eParameters_15= ruleEParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEParametersEParameterDeclParserRuleCall_7_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5270);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5235);
lv_eParameters_15=ruleEParameterDecl();
_fsp--;
@@ -5183,11 +5168,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,29,FOLLOW_29_in_ruleEOperationDecl5287);
+ match(input,29,FOLLOW_29_in_ruleEOperationDecl5252);
createLeafNode(grammarAccess.getEOperationDeclAccess().getRightParenthesisKeyword_8(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2595:1: ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2575:1: ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )?
int alt55=2;
int LA55_0 = input.LA(1);
@@ -5196,19 +5181,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt55) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2595:2: 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2575:2: 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
{
- match(input,53,FOLLOW_53_in_ruleEOperationDecl5297);
+ match(input,53,FOLLOW_53_in_ruleEOperationDecl5262);
createLeafNode(grammarAccess.getEOperationDeclAccess().getThrowsKeyword_9_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2599:1: (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2602:6: lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2579:1: (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2582:6: lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericExceptionsEGenericTypeReferenceDeclParserRuleCall_9_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5331);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5296);
lv_eGenericExceptions_18=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5228,7 +5213,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2620:2: ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2600:2: ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
loop54:
do {
int alt54=2;
@@ -5241,19 +5226,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt54) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2620:3: ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2600:3: ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5345);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5310);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_9_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2624:1: (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2627:6: lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2604:1: (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2607:6: lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericExceptionsEGenericTypeReferenceDeclParserRuleCall_9_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5379);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5344);
lv_eGenericExceptions_20=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5288,7 +5273,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEOperationDecl5396);
+ match(input,18,FOLLOW_18_in_ruleEOperationDecl5361);
createLeafNode(grammarAccess.getEOperationDeclAccess().getSemicolonKeyword_10(), null);
@@ -5315,7 +5300,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2656:1: entryRuleEParameterDecl returns [EObject current=null] : iv_ruleEParameterDecl= ruleEParameterDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2636:1: entryRuleEParameterDecl returns [EObject current=null] : iv_ruleEParameterDecl= ruleEParameterDecl EOF ;
public final EObject entryRuleEParameterDecl() throws RecognitionException {
EObject current = null;
@@ -5323,16 +5308,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2656:56: (iv_ruleEParameterDecl= ruleEParameterDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2657:2: iv_ruleEParameterDecl= ruleEParameterDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2636:56: (iv_ruleEParameterDecl= ruleEParameterDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2637:2: iv_ruleEParameterDecl= ruleEParameterDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEParameterDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5429);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5394);
iv_ruleEParameterDecl=ruleEParameterDecl();
_fsp--;
current =iv_ruleEParameterDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEParameterDecl5439);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEParameterDecl5404);
}
@@ -5350,7 +5335,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2664:1: ruleEParameterDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2644:1: ruleEParameterDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) ;
public final EObject ruleEParameterDecl() throws RecognitionException {
EObject current = null;
@@ -5363,13 +5348,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2669:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2670:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2649:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2670:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2670:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2670:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop56:
do {
int alt56=2;
@@ -5382,12 +5367,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt56) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2673:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2653:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEParameterDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5498);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5463);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -5413,13 +5398,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2691:3: (lv_eGenericType_1= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2694:6: lv_eGenericType_1= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2671:3: (lv_eGenericType_1= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2674:6: lv_eGenericType_1= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEParameterDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5537);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5502);
lv_eGenericType_1=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5439,11 +5424,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2712:2: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2714:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2692:2: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2694:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEParameterDecl5563);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEParameterDecl5528);
createLeafNode(grammarAccess.getEParameterDeclAccess().getNameIDTerminalRuleCall_2_0(), "name");
@@ -5485,7 +5470,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleMapEntry
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2739:1: entryRuleMapEntry returns [EObject current=null] : iv_ruleMapEntry= ruleMapEntry EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2719:1: entryRuleMapEntry returns [EObject current=null] : iv_ruleMapEntry= ruleMapEntry EOF ;
public final EObject entryRuleMapEntry() throws RecognitionException {
EObject current = null;
@@ -5493,16 +5478,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2739:50: (iv_ruleMapEntry= ruleMapEntry EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2740:2: iv_ruleMapEntry= ruleMapEntry EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2719:50: (iv_ruleMapEntry= ruleMapEntry EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2720:2: iv_ruleMapEntry= ruleMapEntry EOF
{
currentNode = createCompositeNode(grammarAccess.getMapEntryRule(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_entryRuleMapEntry5604);
+ pushFollow(FOLLOW_ruleMapEntry_in_entryRuleMapEntry5569);
iv_ruleMapEntry=ruleMapEntry();
_fsp--;
current =iv_ruleMapEntry;
- match(input,EOF,FOLLOW_EOF_in_entryRuleMapEntry5614);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleMapEntry5579);
}
@@ -5520,7 +5505,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleMapEntry
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2747:1: ruleMapEntry returns [EObject current=null] : ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2727:1: ruleMapEntry returns [EObject current=null] : ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) ;
public final EObject ruleMapEntry() throws RecognitionException {
EObject current = null;
@@ -5530,17 +5515,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2752:6: ( ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2753:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2732:6: ( ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2753:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2753:2: (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:2: (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2753:2: (lv_key_0= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2755:6: lv_key_0= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:2: (lv_key_0= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2735:6: lv_key_0= RULE_ID
{
lv_key_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMapEntry5661);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMapEntry5626);
createLeafNode(grammarAccess.getMapEntryAccess().getKeyIDTerminalRuleCall_0_0(), "key");
@@ -5559,15 +5544,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,17,FOLLOW_17_in_ruleMapEntry5678);
+ match(input,17,FOLLOW_17_in_ruleMapEntry5643);
createLeafNode(grammarAccess.getMapEntryAccess().getEqualsSignKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2777:1: (lv_value_2= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2779:6: lv_value_2= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2757:1: (lv_value_2= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2759:6: lv_value_2= RULE_STRING
{
lv_value_2=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleMapEntry5700);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleMapEntry5665);
createLeafNode(grammarAccess.getMapEntryAccess().getValueSTRINGTerminalRuleCall_2_0(), "value");
@@ -5609,7 +5594,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleQID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2804:1: entryRuleQID returns [String current=null] : iv_ruleQID= ruleQID EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2784:1: entryRuleQID returns [String current=null] : iv_ruleQID= ruleQID EOF ;
public final String entryRuleQID() throws RecognitionException {
String current = null;
@@ -5617,16 +5602,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2804:44: (iv_ruleQID= ruleQID EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2805:2: iv_ruleQID= ruleQID EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2784:44: (iv_ruleQID= ruleQID EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2785:2: iv_ruleQID= ruleQID EOF
{
currentNode = createCompositeNode(grammarAccess.getQIDRule(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_entryRuleQID5742);
+ pushFollow(FOLLOW_ruleQID_in_entryRuleQID5707);
iv_ruleQID=ruleQID();
_fsp--;
current =iv_ruleQID.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleQID5753);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQID5718);
}
@@ -5644,7 +5629,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleQID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2812:1: ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2792:1: ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) ;
public final AntlrDatatypeRuleToken ruleQID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5655,21 +5640,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2818:6: ( (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2819:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2798:6: ( (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2819:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2819:6: this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:6: this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
{
this_ID_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5793);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5758);
current.merge(this_ID_0);
createLeafNode(grammarAccess.getQIDAccess().getIDTerminalRuleCall_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2826:1: ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:1: ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
loop58:
do {
int alt58=2;
@@ -5682,9 +5667,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt58) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2826:2: (kw= '.' | kw= '$' ) this_ID_3= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:2: (kw= '.' | kw= '$' ) this_ID_3= RULE_ID
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2826:2: (kw= '.' | kw= '$' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:2: (kw= '.' | kw= '$' )
int alt57=2;
int LA57_0 = input.LA(1);
@@ -5696,16 +5681,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2826:2: (kw= '.' | kw= '$' )", 57, 0, input);
+ new NoViableAltException("2806:2: (kw= '.' | kw= '$' )", 57, 0, input);
throw nvae;
}
switch (alt57) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2827:2: kw= '.'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2807:2: kw= '.'
{
kw=(Token)input.LT(1);
- match(input,54,FOLLOW_54_in_ruleQID5813);
+ match(input,54,FOLLOW_54_in_ruleQID5778);
current.merge(kw);
createLeafNode(grammarAccess.getQIDAccess().getFullStopKeyword_1_0_0(), null);
@@ -5714,13 +5699,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2834:2: kw= '$'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2814:2: kw= '$'
{
kw=(Token)input.LT(1);
- match(input,55,FOLLOW_55_in_ruleQID5832);
+ match(input,55,FOLLOW_55_in_ruleQID5797);
current.merge(kw);
- createLeafNode(grammarAccess.getQIDAccess().get$Keyword_1_0_1(), null);
+ createLeafNode(grammarAccess.getQIDAccess().getDollarSignKeyword_1_0_1(), null);
}
@@ -5729,7 +5714,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
this_ID_3=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5848);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5813);
current.merge(this_ID_3);
@@ -5769,7 +5754,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleSTRING_OR_QID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2854:1: entryRuleSTRING_OR_QID returns [String current=null] : iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2834:1: entryRuleSTRING_OR_QID returns [String current=null] : iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF ;
public final String entryRuleSTRING_OR_QID() throws RecognitionException {
String current = null;
@@ -5777,16 +5762,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2854:54: (iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2855:2: iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2834:54: (iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2835:2: iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF
{
currentNode = createCompositeNode(grammarAccess.getSTRING_OR_QIDRule(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5894);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5859);
iv_ruleSTRING_OR_QID=ruleSTRING_OR_QID();
_fsp--;
current =iv_ruleSTRING_OR_QID.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleSTRING_OR_QID5905);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSTRING_OR_QID5870);
}
@@ -5804,7 +5789,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleSTRING_OR_QID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2862:1: ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2842:1: ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) ;
public final AntlrDatatypeRuleToken ruleSTRING_OR_QID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5815,10 +5800,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2868:6: ( (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2869:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2848:6: ( (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2869:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
int alt59=2;
int LA59_0 = input.LA(1);
@@ -5830,16 +5815,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2869:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )", 59, 0, input);
+ new NoViableAltException("2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )", 59, 0, input);
throw nvae;
}
switch (alt59) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2869:6: this_STRING_0= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:6: this_STRING_0= RULE_STRING
{
this_STRING_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5945);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5910);
current.merge(this_STRING_0);
@@ -5850,12 +5835,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2878:5: this_QID_1= ruleQID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2858:5: this_QID_1= ruleQID
{
currentNode=createCompositeNode(grammarAccess.getSTRING_OR_QIDAccess().getQIDParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_ruleSTRING_OR_QID5978);
+ pushFollow(FOLLOW_ruleQID_in_ruleSTRING_OR_QID5943);
this_QID_1=ruleQID();
_fsp--;
@@ -5892,7 +5877,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleSINT
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2896:1: entryRuleSINT returns [String current=null] : iv_ruleSINT= ruleSINT EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2876:1: entryRuleSINT returns [String current=null] : iv_ruleSINT= ruleSINT EOF ;
public final String entryRuleSINT() throws RecognitionException {
String current = null;
@@ -5900,16 +5885,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2896:45: (iv_ruleSINT= ruleSINT EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2897:2: iv_ruleSINT= ruleSINT EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2876:45: (iv_ruleSINT= ruleSINT EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2877:2: iv_ruleSINT= ruleSINT EOF
{
currentNode = createCompositeNode(grammarAccess.getSINTRule(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_entryRuleSINT6022);
+ pushFollow(FOLLOW_ruleSINT_in_entryRuleSINT5987);
iv_ruleSINT=ruleSINT();
_fsp--;
current =iv_ruleSINT.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleSINT6033);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSINT5998);
}
@@ -5927,7 +5912,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleSINT
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2904:1: ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2884:1: ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
public final AntlrDatatypeRuleToken ruleSINT() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5937,13 +5922,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2910:6: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:1: ( (kw= '-' )? this_INT_1= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2890:6: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:1: ( (kw= '-' )? this_INT_1= RULE_INT )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:1: ( (kw= '-' )? this_INT_1= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:2: (kw= '-' )? this_INT_1= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:1: ( (kw= '-' )? this_INT_1= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:2: (kw= '-' )? this_INT_1= RULE_INT
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:2: (kw= '-' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:2: (kw= '-' )?
int alt60=2;
int LA60_0 = input.LA(1);
@@ -5952,10 +5937,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt60) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2912:2: kw= '-'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2892:2: kw= '-'
{
kw=(Token)input.LT(1);
- match(input,56,FOLLOW_56_in_ruleSINT6072);
+ match(input,56,FOLLOW_56_in_ruleSINT6037);
current.merge(kw);
createLeafNode(grammarAccess.getSINTAccess().getHyphenMinusKeyword_0(), null);
@@ -5967,7 +5952,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
this_INT_1=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSINT6089);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSINT6054);
current.merge(this_INT_1);
@@ -6286,7 +6271,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA10_transition;
}
public String getDescription() {
- return "559:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )";
+ return "551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )";
}
}
static final String DFA21_eotS =
@@ -6364,7 +6349,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA21_transition;
}
public String getDescription() {
- return "()* loopback of 1009:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*";
+ return "()* loopback of 997:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*";
}
}
static final String DFA22_eotS =
@@ -6451,7 +6436,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA22_transition;
}
public String getDescription() {
- return "1077:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )";
+ return "1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )";
}
}
@@ -6494,190 +6479,190 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl984 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleEClassifierDecl994 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1041 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1075 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1114 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEDataTypeDecl1124 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1184 = new BitSet(new long[]{0x0000000005000040L});
- public static final BitSet FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1211 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleEDataTypeDecl1230 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEDataTypeDecl1252 = new BitSet(new long[]{0x0000000002000000L});
- public static final BitSet FOLLOW_25_in_ruleEDataTypeDecl1269 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1303 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEDataTypeDecl1316 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1346 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1385 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEAnnotationDecl1395 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_26_in_ruleEAnnotationDecl1429 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1463 = new BitSet(new long[]{0x0000000008000002L});
- public static final BitSet FOLLOW_27_in_ruleEAnnotationDecl1477 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1511 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_28_in_ruleEAnnotationDecl1525 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1559 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_29_in_ruleEAnnotationDecl1574 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1609 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEClassDecl1619 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1678 = new BitSet(new long[]{0x00000001C4000000L});
- public static final BitSet FOLLOW_30_in_ruleEClassDecl1704 = new BitSet(new long[]{0x0000000180000000L});
- public static final BitSet FOLLOW_31_in_ruleEClassDecl1740 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_32_in_ruleEClassDecl1768 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEClassDecl1791 = new BitSet(new long[]{0x0000000A02400000L});
- public static final BitSet FOLLOW_33_in_ruleEClassDecl1809 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1843 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEClassDecl1857 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1891 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEClassDecl1906 = new BitSet(new long[]{0x0000000802400000L});
- public static final BitSet FOLLOW_35_in_ruleEClassDecl1918 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1952 = new BitSet(new long[]{0x0000000012400000L});
- public static final BitSet FOLLOW_28_in_ruleEClassDecl1966 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2000 = new BitSet(new long[]{0x0000000012400000L});
- public static final BitSet FOLLOW_25_in_ruleEClassDecl2018 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2052 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleEClassDecl2067 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2102 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2146 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_23_in_ruleEClassDecl2161 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2194 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2204 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2251 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2285 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2324 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEAttributeDecl2334 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2393 = new BitSet(new long[]{0x000003F004000380L});
- public static final BitSet FOLLOW_36_in_ruleEAttributeDecl2420 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEAttributeDecl2461 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2497 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2533 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_37_in_ruleEAttributeDecl2568 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_38_in_ruleEAttributeDecl2608 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_39_in_ruleEAttributeDecl2648 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_40_in_ruleEAttributeDecl2688 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_41_in_ruleEAttributeDecl2712 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2746 = new BitSet(new long[]{0x0000040000000010L});
- public static final BitSet FOLLOW_42_in_ruleEAttributeDecl2760 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEAttributeDecl2782 = new BitSet(new long[]{0x0000180000000000L});
- public static final BitSet FOLLOW_43_in_ruleEAttributeDecl2800 = new BitSet(new long[]{0x0100000000000400L});
- public static final BitSet FOLLOW_ruleSINT_in_ruleEAttributeDecl2834 = new BitSet(new long[]{0x0000100000000000L});
- public static final BitSet FOLLOW_44_in_ruleEAttributeDecl2849 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEAttributeDecl2873 = new BitSet(new long[]{0x0000000000060000L});
- public static final BitSet FOLLOW_17_in_ruleEAttributeDecl2891 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleEAttributeDecl2913 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEAttributeDecl2932 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2965 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEReferenceDecl2975 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl3034 = new BitSet(new long[]{0x000061E004000B80L});
- public static final BitSet FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3062 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEReferenceDecl3098 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3134 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3170 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_37_in_ruleEReferenceDecl3205 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_38_in_ruleEReferenceDecl3245 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_39_in_ruleEReferenceDecl3285 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_40_in_ruleEReferenceDecl3325 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_45_in_ruleEReferenceDecl3362 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_46_in_ruleEReferenceDecl3390 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3425 = new BitSet(new long[]{0x0000840000000010L});
- public static final BitSet FOLLOW_42_in_ruleEReferenceDecl3439 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEReferenceDecl3461 = new BitSet(new long[]{0x0000180000000000L});
- public static final BitSet FOLLOW_43_in_ruleEReferenceDecl3479 = new BitSet(new long[]{0x0100000000000400L});
- public static final BitSet FOLLOW_ruleSINT_in_ruleEReferenceDecl3513 = new BitSet(new long[]{0x0000100000000000L});
- public static final BitSet FOLLOW_44_in_ruleEReferenceDecl3528 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_47_in_ruleEReferenceDecl3540 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3562 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3589 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEReferenceDecl3606 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3639 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEEnumDecl3649 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3708 = new BitSet(new long[]{0x0001000004000000L});
- public static final BitSet FOLLOW_48_in_ruleEEnumDecl3722 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumDecl3744 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleEEnumDecl3761 = new BitSet(new long[]{0x0000000004000010L});
- public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3795 = new BitSet(new long[]{0x0000000004800010L});
- public static final BitSet FOLLOW_23_in_ruleEEnumDecl3809 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3842 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3852 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3911 = new BitSet(new long[]{0x0000000004000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3938 = new BitSet(new long[]{0x0000000000060020L});
- public static final BitSet FOLLOW_17_in_ruleEEnumLiteralDecl3956 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3978 = new BitSet(new long[]{0x0000000000040020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl4010 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEEnumLiteralDecl4028 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4061 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleETypeParameterDecl4071 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleETypeParameterDecl4118 = new BitSet(new long[]{0x0000000800000002L});
- public static final BitSet FOLLOW_35_in_ruleETypeParameterDecl4136 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4170 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4209 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4219 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4267 = new BitSet(new long[]{0x0000000200000002L});
- public static final BitSet FOLLOW_33_in_ruleEGenericTypeReferenceDecl4280 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4314 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEGenericTypeReferenceDecl4328 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4362 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEGenericTypeReferenceDecl4377 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_47_in_ruleEGenericTypeReferenceDecl4396 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4418 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4455 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeDecl4465 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4513 = new BitSet(new long[]{0x0000000200000002L});
- public static final BitSet FOLLOW_33_in_ruleEGenericTypeDecl4526 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4560 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEGenericTypeDecl4574 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4608 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEGenericTypeDecl4623 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_47_in_ruleEGenericTypeDecl4642 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4664 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_49_in_ruleEGenericTypeDecl4684 = new BitSet(new long[]{0x0004000800000000L});
- public static final BitSet FOLLOW_35_in_ruleEGenericTypeDecl4695 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4729 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_50_in_ruleEGenericTypeDecl4750 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4784 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4824 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEOperationDecl4834 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4893 = new BitSet(new long[]{0x0008000004000180L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEOperationDecl4920 = new BitSet(new long[]{0x0008000000000180L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4960 = new BitSet(new long[]{0x0008000000000180L});
- public static final BitSet FOLLOW_51_in_ruleEOperationDecl4984 = new BitSet(new long[]{0x0010800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5019 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_52_in_ruleEOperationDecl5038 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEOperationDecl5061 = new BitSet(new long[]{0x0000000208000000L});
- public static final BitSet FOLLOW_33_in_ruleEOperationDecl5079 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5113 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5127 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5161 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEOperationDecl5176 = new BitSet(new long[]{0x0000000008000000L});
- public static final BitSet FOLLOW_27_in_ruleEOperationDecl5187 = new BitSet(new long[]{0x0000800024000010L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5222 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5236 = new BitSet(new long[]{0x0000800004000010L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5270 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_29_in_ruleEOperationDecl5287 = new BitSet(new long[]{0x0020000000040000L});
- public static final BitSet FOLLOW_53_in_ruleEOperationDecl5297 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5331 = new BitSet(new long[]{0x0000000010040000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5345 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5379 = new BitSet(new long[]{0x0000000010040000L});
- public static final BitSet FOLLOW_18_in_ruleEOperationDecl5396 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5429 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEParameterDecl5439 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5498 = new BitSet(new long[]{0x0000800004000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5537 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEParameterDecl5563 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleMapEntry_in_entryRuleMapEntry5604 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleMapEntry5614 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleMapEntry5661 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleMapEntry5678 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleMapEntry5700 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQID_in_entryRuleQID5742 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQID5753 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQID5793 = new BitSet(new long[]{0x00C0000000000002L});
- public static final BitSet FOLLOW_54_in_ruleQID5813 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_55_in_ruleQID5832 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQID5848 = new BitSet(new long[]{0x00C0000000000002L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5894 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSTRING_OR_QID5905 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5945 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQID_in_ruleSTRING_OR_QID5978 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleSINT_in_entryRuleSINT6022 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSINT6033 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_56_in_ruleSINT6072 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleSINT6089 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1068 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1100 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEDataTypeDecl1110 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1170 = new BitSet(new long[]{0x0000000005000040L});
+ public static final BitSet FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1197 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_24_in_ruleEDataTypeDecl1216 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEDataTypeDecl1238 = new BitSet(new long[]{0x0000000002000000L});
+ public static final BitSet FOLLOW_25_in_ruleEDataTypeDecl1255 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1289 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEDataTypeDecl1302 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1332 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1364 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEAnnotationDecl1374 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_26_in_ruleEAnnotationDecl1408 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1442 = new BitSet(new long[]{0x0000000008000002L});
+ public static final BitSet FOLLOW_27_in_ruleEAnnotationDecl1456 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1490 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_28_in_ruleEAnnotationDecl1504 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1538 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_29_in_ruleEAnnotationDecl1553 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1588 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEClassDecl1598 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1657 = new BitSet(new long[]{0x00000001C4000000L});
+ public static final BitSet FOLLOW_30_in_ruleEClassDecl1683 = new BitSet(new long[]{0x0000000180000000L});
+ public static final BitSet FOLLOW_31_in_ruleEClassDecl1719 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_32_in_ruleEClassDecl1747 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEClassDecl1770 = new BitSet(new long[]{0x0000000A02400000L});
+ public static final BitSet FOLLOW_33_in_ruleEClassDecl1788 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1822 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEClassDecl1836 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1870 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEClassDecl1885 = new BitSet(new long[]{0x0000000802400000L});
+ public static final BitSet FOLLOW_35_in_ruleEClassDecl1897 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1931 = new BitSet(new long[]{0x0000000012400000L});
+ public static final BitSet FOLLOW_28_in_ruleEClassDecl1945 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1979 = new BitSet(new long[]{0x0000000012400000L});
+ public static final BitSet FOLLOW_25_in_ruleEClassDecl1997 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2031 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleEClassDecl2046 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2081 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2125 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_23_in_ruleEClassDecl2140 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2173 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2183 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2230 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2257 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2289 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEAttributeDecl2299 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2358 = new BitSet(new long[]{0x000003F004000380L});
+ public static final BitSet FOLLOW_36_in_ruleEAttributeDecl2385 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEAttributeDecl2426 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2462 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2498 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_37_in_ruleEAttributeDecl2533 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_38_in_ruleEAttributeDecl2573 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_39_in_ruleEAttributeDecl2613 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_40_in_ruleEAttributeDecl2653 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_41_in_ruleEAttributeDecl2677 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2711 = new BitSet(new long[]{0x0000040000000010L});
+ public static final BitSet FOLLOW_42_in_ruleEAttributeDecl2725 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEAttributeDecl2747 = new BitSet(new long[]{0x0000180000000000L});
+ public static final BitSet FOLLOW_43_in_ruleEAttributeDecl2765 = new BitSet(new long[]{0x0100000000000400L});
+ public static final BitSet FOLLOW_ruleSINT_in_ruleEAttributeDecl2799 = new BitSet(new long[]{0x0000100000000000L});
+ public static final BitSet FOLLOW_44_in_ruleEAttributeDecl2814 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEAttributeDecl2838 = new BitSet(new long[]{0x0000000000060000L});
+ public static final BitSet FOLLOW_17_in_ruleEAttributeDecl2856 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleEAttributeDecl2878 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEAttributeDecl2897 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2930 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEReferenceDecl2940 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2999 = new BitSet(new long[]{0x000061E004000B80L});
+ public static final BitSet FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3027 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEReferenceDecl3063 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3099 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3135 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_37_in_ruleEReferenceDecl3170 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_38_in_ruleEReferenceDecl3210 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_39_in_ruleEReferenceDecl3250 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_40_in_ruleEReferenceDecl3290 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_45_in_ruleEReferenceDecl3327 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_46_in_ruleEReferenceDecl3355 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3390 = new BitSet(new long[]{0x0000840000000010L});
+ public static final BitSet FOLLOW_42_in_ruleEReferenceDecl3404 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEReferenceDecl3426 = new BitSet(new long[]{0x0000180000000000L});
+ public static final BitSet FOLLOW_43_in_ruleEReferenceDecl3444 = new BitSet(new long[]{0x0100000000000400L});
+ public static final BitSet FOLLOW_ruleSINT_in_ruleEReferenceDecl3478 = new BitSet(new long[]{0x0000100000000000L});
+ public static final BitSet FOLLOW_44_in_ruleEReferenceDecl3493 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_47_in_ruleEReferenceDecl3505 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3527 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3554 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEReferenceDecl3571 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3604 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEEnumDecl3614 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3673 = new BitSet(new long[]{0x0001000004000000L});
+ public static final BitSet FOLLOW_48_in_ruleEEnumDecl3687 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumDecl3709 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleEEnumDecl3726 = new BitSet(new long[]{0x0000000004000010L});
+ public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3760 = new BitSet(new long[]{0x0000000004800010L});
+ public static final BitSet FOLLOW_23_in_ruleEEnumDecl3774 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3807 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3817 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3876 = new BitSet(new long[]{0x0000000004000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3903 = new BitSet(new long[]{0x0000000000060020L});
+ public static final BitSet FOLLOW_17_in_ruleEEnumLiteralDecl3921 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3943 = new BitSet(new long[]{0x0000000000040020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3975 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEEnumLiteralDecl3993 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4026 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleETypeParameterDecl4036 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleETypeParameterDecl4083 = new BitSet(new long[]{0x0000000800000002L});
+ public static final BitSet FOLLOW_35_in_ruleETypeParameterDecl4101 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4135 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4174 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4184 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4232 = new BitSet(new long[]{0x0000000200000002L});
+ public static final BitSet FOLLOW_33_in_ruleEGenericTypeReferenceDecl4245 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4279 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEGenericTypeReferenceDecl4293 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4327 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEGenericTypeReferenceDecl4342 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_47_in_ruleEGenericTypeReferenceDecl4361 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4383 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4420 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeDecl4430 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4478 = new BitSet(new long[]{0x0000000200000002L});
+ public static final BitSet FOLLOW_33_in_ruleEGenericTypeDecl4491 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4525 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEGenericTypeDecl4539 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4573 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEGenericTypeDecl4588 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_47_in_ruleEGenericTypeDecl4607 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4629 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_49_in_ruleEGenericTypeDecl4649 = new BitSet(new long[]{0x0004000800000000L});
+ public static final BitSet FOLLOW_35_in_ruleEGenericTypeDecl4660 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4694 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_50_in_ruleEGenericTypeDecl4715 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4749 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4789 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEOperationDecl4799 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4858 = new BitSet(new long[]{0x0008000004000180L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEOperationDecl4885 = new BitSet(new long[]{0x0008000000000180L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4925 = new BitSet(new long[]{0x0008000000000180L});
+ public static final BitSet FOLLOW_51_in_ruleEOperationDecl4949 = new BitSet(new long[]{0x0010800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4984 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_52_in_ruleEOperationDecl5003 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEOperationDecl5026 = new BitSet(new long[]{0x0000000208000000L});
+ public static final BitSet FOLLOW_33_in_ruleEOperationDecl5044 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5078 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5092 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5126 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEOperationDecl5141 = new BitSet(new long[]{0x0000000008000000L});
+ public static final BitSet FOLLOW_27_in_ruleEOperationDecl5152 = new BitSet(new long[]{0x0000800024000010L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5187 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5201 = new BitSet(new long[]{0x0000800004000010L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5235 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_29_in_ruleEOperationDecl5252 = new BitSet(new long[]{0x0020000000040000L});
+ public static final BitSet FOLLOW_53_in_ruleEOperationDecl5262 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5296 = new BitSet(new long[]{0x0000000010040000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5310 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5344 = new BitSet(new long[]{0x0000000010040000L});
+ public static final BitSet FOLLOW_18_in_ruleEOperationDecl5361 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5394 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEParameterDecl5404 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5463 = new BitSet(new long[]{0x0000800004000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5502 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEParameterDecl5528 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_entryRuleMapEntry5569 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleMapEntry5579 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleMapEntry5626 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleMapEntry5643 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleMapEntry5665 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQID_in_entryRuleQID5707 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQID5718 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQID5758 = new BitSet(new long[]{0x00C0000000000002L});
+ public static final BitSet FOLLOW_54_in_ruleQID5778 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_55_in_ruleQID5797 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQID5813 = new BitSet(new long[]{0x00C0000000000002L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5859 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSTRING_OR_QID5870 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5910 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQID_in_ruleSTRING_OR_QID5943 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleSINT_in_entryRuleSINT5987 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSINT5998 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_56_in_ruleSINT6037 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleSINT6054 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
index 320fd77..067e01f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
@@ -49,40 +49,40 @@ T54 : '.' ;
T55 : '$' ;
T56 : '-' ;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2930
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2911
RULE_BAG : 'bag';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2932
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2913
RULE_RANDOM : 'random';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2934
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2915
RULE_READONLY : 'readonly';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2936
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2917
RULE_LOCAL : 'local';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2938
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2919
RULE_SERIALIZABLE : '!serializable';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2940
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2921
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2942
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2923
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2944
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2925
RULE_STRING : ('\"' ('\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2946
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2927
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2948
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2929
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2950
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2931
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2952
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2933
RULE_ANY_OTHER : .;
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
index afe4142..031ca54 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
@@ -160,7 +160,7 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
group$3$Consumer = new Group$3$Consumer(rule.getGroup_1());
alternatives$4$Consumer = new Alternatives$4$Consumer(rule.getAlternatives_1_0());
keyword$5$Consumer = new Keyword$5$Consumer(rule.getFullStopKeyword_1_0_0());
- keyword$6$Consumer = new Keyword$6$Consumer(rule.get$Keyword_1_0_1());
+ keyword$6$Consumer = new Keyword$6$Consumer(rule.getDollarSignKeyword_1_0_1());
ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getIDTerminalRuleCall_1_1());
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
index 6c3f633..307bd4e 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
@@ -1520,7 +1520,7 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
private final Alternatives cAlternatives_1_0 = (Alternatives)cGroup_1.eContents().get(0);
private final Keyword cFullStopKeyword_1_0_0 = (Keyword)cAlternatives_1_0.eContents().get(0);
- private final Keyword c$Keyword_1_0_1 = (Keyword)cAlternatives_1_0.eContents().get(1);
+ private final Keyword cDollarSignKeyword_1_0_1 = (Keyword)cAlternatives_1_0.eContents().get(1);
private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
//QID returns ecore::EString:
@@ -1543,7 +1543,7 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
public Keyword getFullStopKeyword_1_0_0() { return cFullStopKeyword_1_0_0; }
//"$"
- public Keyword get$Keyword_1_0_1() { return c$Keyword_1_0_1; }
+ public Keyword getDollarSignKeyword_1_0_1() { return cDollarSignKeyword_1_0_1; }
//ID
public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
@@ -1589,6 +1589,7 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
}
+
private EcoreDslElements pEcoreDsl;
private ImportStatementDeclElements pImportStatementDecl;
private EPackageDeclElements pEPackageDecl;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g
index f3ee02f..efca920 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g
@@ -462,6 +462,7 @@ ruleTransition returns [EObject current=null]
+
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java
index 084827f..2c99eaa 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java
@@ -208,10 +208,10 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:466:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:466:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:11: ( '^' )?
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:466:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -220,7 +220,7 @@ public class InternalFowlerDslLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:11: '^'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:466:11: '^'
{
match('^');
@@ -239,7 +239,7 @@ public class InternalFowlerDslLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:466:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -287,10 +287,10 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:468:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:468:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:468:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -304,7 +304,7 @@ public class InternalFowlerDslLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:468:13: '0' .. '9'
{
matchRange('0','9');
@@ -334,10 +334,10 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -349,16 +349,16 @@ public class InternalFowlerDslLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("469:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("470:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -374,7 +374,7 @@ public class InternalFowlerDslLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470: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' ) {
@@ -391,7 +391,7 @@ public class InternalFowlerDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:64: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:64: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -417,10 +417,10 @@ public class InternalFowlerDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -436,7 +436,7 @@ public class InternalFowlerDslLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:92: '\\\\' ( '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' ) {
@@ -453,7 +453,7 @@ public class InternalFowlerDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:134: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:470:134: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -495,12 +495,12 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:472:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:472:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:472:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -525,7 +525,7 @@ public class InternalFowlerDslLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:52: .
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:472:52: .
{
matchAny();
@@ -553,12 +553,12 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -571,7 +571,7 @@ public class InternalFowlerDslLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474: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();
@@ -592,7 +592,7 @@ public class InternalFowlerDslLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -601,9 +601,9 @@ public class InternalFowlerDslLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:41: ( '\\r' )?
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -612,7 +612,7 @@ public class InternalFowlerDslLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:41: '\\r'
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:474:41: '\\r'
{
match('\r');
@@ -642,10 +642,10 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:476:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:476:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:476:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -698,8 +698,8 @@ public class InternalFowlerDslLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:477:16: ( . )
- // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:477:18: .
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:478:16: ( . )
+ // ../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:478:18: .
{
matchAny();
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
index 3ad9765..c391d30 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
@@ -17,25 +17,25 @@ T17 : '{' ;
T18 : '}' ;
T19 : '=>' ;
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 465
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 466
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 467
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 468
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 469
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 470
RULE_STRING : ('\"' ('\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 471
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 472
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 473
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 474
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 475
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 476
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 477
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 478
RULE_ANY_OTHER : .;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
index 1c4e67a..7e31deb 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
@@ -237,6 +237,7 @@ public class FowlerDslGrammarAccess implements IGrammarAccess {
public RuleCall getStateStateIDTerminalRuleCall_2_0_1() { return cStateStateIDTerminalRuleCall_2_0_1; }
}
+
private StatemachineElements pStatemachine;
private EventElements pEvent;
private CommandElements pCommand;
diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index 02c5355..1816e02 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -137,5 +137,11 @@ Export-Package: org.eclipse.xtext,
org.eclipse.xtext.valueconverter.parser.packrat,
org.eclipse.xtext.valueconverter.parser.packrat.consumers,
org.eclipse.xtext.valueconverter.parseTreeConstruction,
- org.eclipse.xtext.valueconverter.parser.antlr
+ org.eclipse.xtext.valueconverter.parser.antlr,
+ org.eclipse.xtext.enumrules,
+ org.eclipse.xtext.enumrules.enumRulesTestLanguage,
+ org.eclipse.xtext.enumrules.parser.packrat,
+ org.eclipse.xtext.enumrules.parser.packrat.consumers,
+ org.eclipse.xtext.enumrules.parseTreeConstruction,
+ org.eclipse.xtext.enumrules.parser.antlr
diff --git a/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsFactory.java b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsFactory.java
new file mode 100644
index 0000000..5e135ca
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsFactory.java
@@ -0,0 +1,37 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EnumsFactory.java,v 1.1 2009/03/18 16:58:37 szarnekow Exp $
+ */
+package org.eclipse.xtext.enumrules.enums;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.enumrules.enums.EnumsPackage
+ * @generated
+ */
+public interface EnumsFactory extends EFactory {
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EnumsFactory eINSTANCE = org.eclipse.xtext.enumrules.enums.impl.EnumsFactoryImpl.init();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the package supported by this factory.
+ * @generated
+ */
+ EnumsPackage getEnumsPackage();
+
+} //EnumsFactory
diff --git a/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsPackage.java b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsPackage.java
new file mode 100644
index 0000000..1376f6b
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/EnumsPackage.java
@@ -0,0 +1,115 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EnumsPackage.java,v 1.1 2009/03/18 16:58:37 szarnekow Exp $
+ */
+package org.eclipse.xtext.enumrules.enums;
+
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.enumrules.enums.EnumsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface EnumsPackage extends EPackage {
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNAME = "enums";
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNS_URI = "http://www.eclipse.org/2009/tmf/xtext/EnumRulesTestLanguage/imported";
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String eNS_PREFIX = "enums";
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EnumsPackage eINSTANCE = org.eclipse.xtext.enumrules.enums.impl.EnumsPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.xtext.enumrules.enums.ExistingEnum <em>Existing Enum</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.enumrules.enums.ExistingEnum
+ * @see org.eclipse.xtext.enumrules.enums.impl.EnumsPackageImpl#getExistingEnum()
+ * @generated
+ */
+ int EXISTING_ENUM = 0;
+
+
+ /**
+ * Returns the meta object for enum '{@link org.eclipse.xtext.enumrules.enums.ExistingEnum <em>Existing Enum</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for enum '<em>Existing Enum</em>'.
+ * @see org.eclipse.xtext.enumrules.enums.ExistingEnum
+ * @generated
+ */
+ EEnum getExistingEnum();
+
+ /**
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ EnumsFactory getEnumsFactory();
+
+ /**
+ * <!-- begin-user-doc -->
+ * Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ interface Literals {
+ /**
+ * The meta object literal for the '{@link org.eclipse.xtext.enumrules.enums.ExistingEnum <em>Existing Enum</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.enumrules.enums.ExistingEnum
+ * @see org.eclipse.xtext.enumrules.enums.impl.EnumsPackageImpl#getExistingEnum()
+ * @generated
+ */
+ EEnum EXISTING_ENUM = eINSTANCE.getExistingEnum();
+
+ }
+
+} //EnumsPackage
diff --git a/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/ExistingEnum.java b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/ExistingEnum.java
new file mode 100644
index 0000000..518d9fa
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/ExistingEnum.java
@@ -0,0 +1,239 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExistingEnum.java,v 1.1 2009/03/18 16:58:37 szarnekow Exp $
+ */
+package org.eclipse.xtext.enumrules.enums;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Existing Enum</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.enumrules.enums.EnumsPackage#getExistingEnum()
+ * @model
+ * @generated
+ */
+public enum ExistingEnum implements Enumerator {
+ /**
+ * The '<em><b>Same Name</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #SAME_NAME_VALUE
+ * @generated
+ * @ordered
+ */
+ SAME_NAME(3, "SameName", "SameName"),
+
+ /**
+ * The '<em><b>Overridden Literal</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #OVERRIDDEN_LITERAL_VALUE
+ * @generated
+ * @ordered
+ */
+ OVERRIDDEN_LITERAL(2, "OverriddenLiteral", "OtherLiteral"),
+
+ /**
+ * The '<em><b>Different Name</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #DIFFERENT_NAME_VALUE
+ * @generated
+ * @ordered
+ */
+ DIFFERENT_NAME(1, "DifferentName", "DifferentLiteral");
+
+ /**
+ * The '<em><b>Same Name</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>Same Name</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #SAME_NAME
+ * @model name="SameName"
+ * @generated
+ * @ordered
+ */
+ public static final int SAME_NAME_VALUE = 3;
+
+ /**
+ * The '<em><b>Overridden Literal</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>Overridden Literal</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #OVERRIDDEN_LITERAL
+ * @model name="OverriddenLiteral" literal="OtherLiteral"
+ * @generated
+ * @ordered
+ */
+ public static final int OVERRIDDEN_LITERAL_VALUE = 2;
+
+ /**
+ * The '<em><b>Different Name</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>Different Name</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #DIFFERENT_NAME
+ * @model name="DifferentName" literal="DifferentLiteral"
+ * @generated
+ * @ordered
+ */
+ public static final int DIFFERENT_NAME_VALUE = 1;
+
+ /**
+ * An array of all the '<em><b>Existing Enum</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static final ExistingEnum[] VALUES_ARRAY =
+ new ExistingEnum[] {
+ SAME_NAME,
+ OVERRIDDEN_LITERAL,
+ DIFFERENT_NAME,
+ };
+
+ /**
+ * A public read-only list of all the '<em><b>Existing Enum</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final List<ExistingEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the '<em><b>Existing Enum</b></em>' literal with the specified literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static ExistingEnum get(String literal) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ ExistingEnum result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Existing Enum</b></em>' literal with the specified name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static ExistingEnum getByName(String name) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ ExistingEnum result = VALUES_ARRAY[i];
+ if (result.getName().equals(name)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Existing Enum</b></em>' literal with the specified integer value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static ExistingEnum get(int value) {
+ switch (value) {
+ case SAME_NAME_VALUE: return SAME_NAME;
+ case OVERRIDDEN_LITERAL_VALUE: return OVERRIDDEN_LITERAL;
+ case DIFFERENT_NAME_VALUE: return DIFFERENT_NAME;
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final int value;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final String name;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private ExistingEnum(int value, String name, String literal) {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getLiteral() {
+ return literal;
+ }
+
+ /**
+ * Returns the literal value of the enumerator, which is its string representation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return literal;
+ }
+
+} //ExistingEnum
diff --git a/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsFactoryImpl.java b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsFactoryImpl.java
new file mode 100644
index 0000000..219d233
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsFactoryImpl.java
@@ -0,0 +1,139 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EnumsFactoryImpl.java,v 1.1 2009/03/18 16:58:43 szarnekow Exp $
+ */
+package org.eclipse.xtext.enumrules.enums.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.xtext.enumrules.enums.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnumsFactoryImpl extends EFactoryImpl implements EnumsFactory {
+ /**
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static EnumsFactory init() {
+ try {
+ EnumsFactory theEnumsFactory = (EnumsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/2009/tmf/xtext/EnumRulesTestLanguage/imported");
+ if (theEnumsFactory != null) {
+ return theEnumsFactory;
+ }
+ }
+ catch (Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new EnumsFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnumsFactoryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public EObject create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object createFromString(EDataType eDataType, String initialValue) {
+ switch (eDataType.getClassifierID()) {
+ case EnumsPackage.EXISTING_ENUM:
+ return createExistingEnumFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String convertToString(EDataType eDataType, Object instanceValue) {
+ switch (eDataType.getClassifierID()) {
+ case EnumsPackage.EXISTING_ENUM:
+ return convertExistingEnumToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ExistingEnum createExistingEnumFromString(EDataType eDataType, String initialValue) {
+ ExistingEnum result = ExistingEnum.get(initialValue);
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ return result;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertExistingEnumToString(EDataType eDataType, Object instanceValue) {
+ return instanceValue == null ? null : instanceValue.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnumsPackage getEnumsPackage() {
+ return (EnumsPackage)getEPackage();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @deprecated
+ * @generated
+ */
+ @Deprecated
+ public static EnumsPackage getPackage() {
+ return EnumsPackage.eINSTANCE;
+ }
+
+} //EnumsFactoryImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsPackageImpl.java
new file mode 100644
index 0000000..feef61f
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/emf-gen/org/eclipse/xtext/enumrules/enums/impl/EnumsPackageImpl.java
@@ -0,0 +1,173 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: EnumsPackageImpl.java,v 1.1 2009/03/18 16:58:43 szarnekow Exp $
+ */
+package org.eclipse.xtext.enumrules.enums.impl;
+
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.xtext.enumrules.enums.EnumsFactory;
+import org.eclipse.xtext.enumrules.enums.EnumsPackage;
+import org.eclipse.xtext.enumrules.enums.ExistingEnum;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EnumsPackageImpl extends EPackageImpl implements EnumsPackage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum existingEnumEEnum = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * package URI value.
+ * <p>Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.xtext.enumrules.enums.EnumsPackage#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private EnumsPackageImpl() {
+ super(eNS_URI, EnumsFactory.eINSTANCE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the <b>Package</b> for this
+ * model, and for any others upon which it depends. Simple
+ * dependencies are satisfied by calling this method on all
+ * dependent packages before doing anything else. This method drives
+ * initialization for interdependent packages directly, in parallel
+ * with this package, itself.
+ * <p>Of this package and its interdependencies, all packages which
+ * have not yet been registered by their URI values are first created
+ * and registered. The packages are then initialized in two steps:
+ * meta-model objects for all of the packages are created before any
+ * are initialized, since one package's meta-model objects may refer to
+ * those of another.
+ * <p>Invocation of this method will not affect any packages that have
+ * already been initialized.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static EnumsPackage init() {
+ if (isInited) return (EnumsPackage)EPackage.Registry.INSTANCE.getEPackage(EnumsPackage.eNS_URI);
+
+ // Obtain or create and register package
+ EnumsPackageImpl theEnumsPackage = (EnumsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EnumsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EnumsPackageImpl());
+
+ isInited = true;
+
+ // Create package meta-data objects
+ theEnumsPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theEnumsPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theEnumsPackage.freeze();
+
+ return theEnumsPackage;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EEnum getExistingEnum() {
+ return existingEnumEEnum;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EnumsFactory getEnumsFactory() {
+ return (EnumsFactory)getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createPackageContents() {
+ if (isCreated) return;
+ isCreated = true;
+
+ // Create enums
+ existingEnumEEnum = createEEnum(EXISTING_ENUM);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void initializePackageContents() {
+ if (isInitialized) return;
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Initialize enums and add enum literals
+ initEEnum(existingEnumEEnum, ExistingEnum.class, "ExistingEnum");
+ addEEnumLiteral(existingEnumEEnum, ExistingEnum.SAME_NAME);
+ addEEnumLiteral(existingEnumEEnum, ExistingEnum.OVERRIDDEN_LITERAL);
+ addEEnumLiteral(existingEnumEEnum, ExistingEnum.DIFFERENT_NAME);
+
+ // Create resource
+ createResource(eNS_URI);
+ }
+
+} //EnumsPackageImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/plugin.properties b/tests/org.eclipse.xtext.generator.tests/plugin.properties
new file mode 100644
index 0000000..d3b31aa
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/plugin.properties
@@ -0,0 +1,8 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.1 2009/03/18 16:58:43 szarnekow Exp $
+
+pluginName = Enums Model
+providerName = www.example.org
diff --git a/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen b/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
index c05cc98..604856e 100644
--- a/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
@@ -41,6 +41,15 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
+ uri = "http://www.eclipse.org/2008/tmf/xtext/EnumRulesTest"
+ class = "org.eclipse.xtext.enumrules.enumRulesTestLanguage.EnumRulesTestLanguagePackage"
+ genModel = "org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel" />
+
+ </extension>
+
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
uri = "http://www.eclipse.org/2009/tmf/xtext/lowerCaseNamedTestLanguage"
class = "org.eclipse.xtext.generator.lowerCaseNamedTestLanguage.LowerCaseNamedTestLanguagePackage"
genModel = "org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.genmodel" />
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g
index 1259b6d..1a26675 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g
@@ -237,6 +237,7 @@ ruleType returns [EObject current=null]
+
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java
index fe95dd9..e441be8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java
@@ -90,10 +90,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:11: ( '^' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -102,7 +102,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:11: '^'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:11: '^'
{
match('^');
@@ -121,7 +121,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -169,10 +169,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:242:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:242:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:242:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -186,7 +186,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:242:13: '0' .. '9'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:13: '0' .. '9'
{
matchRange('0','9');
@@ -216,10 +216,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:13: ( ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -231,16 +231,16 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("244:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("245:15: ( '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:16: '\\\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:21: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -256,7 +256,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245: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' ) {
@@ -273,7 +273,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:64: ~ ( ( '\\\\' | '\\\"' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:64: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -299,10 +299,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -318,7 +318,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:92: '\\\\' ( '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' ) {
@@ -335,7 +335,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:244:134: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:134: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -377,12 +377,12 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:246:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:246:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:246:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -407,7 +407,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:246:52: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:52: .
{
matchAny();
@@ -435,12 +435,12 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -453,7 +453,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249: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();
@@ -474,7 +474,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -483,9 +483,9 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:41: ( '\\r' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -494,7 +494,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:248:41: '\\r'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:41: '\\r'
{
match('\r');
@@ -524,10 +524,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:250:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:250:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:250:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -580,8 +580,8 @@ public class InternalImportUriTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:252:16: ( . )
- // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:252:18: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:253:16: ( . )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:253:18: .
{
matchAny();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g
index f22bb25..a7e712a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g
+++ b/