summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-01-21 05:25:13 (EST)
committer sefftinge2009-01-21 05:25:13 (EST)
commit32fca9edc1599634a53ccd121f60103226abc704 (patch)
tree841da462453743e9c8560fc16d9a6689ebdbaae1
parent52ebb33a7938f676eee57563cea7710c211b8df3 (diff)
downloadorg.eclipse.xtext-32fca9edc1599634a53ccd121f60103226abc704.zip
org.eclipse.xtext-32fca9edc1599634a53ccd121f60103226abc704.tar.gz
org.eclipse.xtext-32fca9edc1599634a53ccd121f60103226abc704.tar.bz2
reduced number of temporary objects that are created by the packrat parser
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java3
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java12
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java7
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java104
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java138
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/DomainmodelGenProposalProvider.java15
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java188
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java430
-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/parser/packrat/consumers/DomainmodelAttributeConsumer.java5
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java10
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java14
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java6
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java3
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java6
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java9
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java108
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java132
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/GenerateGrammar.java24
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java3
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java11
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java8
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java64
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java74
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangATestLanguageParseTreeConstructor.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java84
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java17
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java17
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi26
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi28
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java1018
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java27
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java59
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java17
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageIDConsumer.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageINTConsumer.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java43
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSL_COMMENTConsumer.java27
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSTRINGConsumer.java59
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWSConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parsetree/reconstr/XtextTerminalsTestLanguageParseTreeConstructor.java290
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java280
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java650
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parsetree/reconstr/FormatterTestLanguageParseTreeConstructor.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestLanguageParseTreeConstructor.java286
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageOpConsumer.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageParensConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyAConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyBConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyCConsumer.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyDConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyEConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyFConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyG1Consumer.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/ComplexReconstrTestLanguageTrickyGConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageBooleanConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageManyStringsConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageOpConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageParensConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageRef2Consumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageSpareConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTwoNumbersConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/consumers/SimpleReconstrTestLanguageTypeConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestLanguageParseTreeConstructor.java138
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestLanguageParseTreeConstructor.java76
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java160
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java102
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestRootConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestListConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestOptionalConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/packrat/consumers/TransientValuesTestTestRequiredConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parsetree/reconstr/TransientValuesTestParseTreeConstructor.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java40
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java370
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageElementConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ActionTestLanguageItemConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageFirstAbstractRuleChildConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageSecondAbstractRuleChildConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ContentAssistTestLanguageStartConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageCommandConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageEventConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStateConsumer.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageStatemachineConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/FowlerDslTestLanguageTransitionConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LexerTestLanguageElementConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead0Consumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead1Consumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead2Consumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/LookaheadTestLanguageLookAhead3Consumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/OptionalEmptyTestLanguageGreetingConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageAbstractChildrenConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageChildrenConsumer.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageContainerConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageFirstConcreteConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageNestedConsumer.java5
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/PartialParserTestLanguageSecondConcreteConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageErwachsenerConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageFamilieConsumer.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageKindConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielplatzConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/ReferenceGrammarTestLanguageSpielzeugConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageAdditionConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageMultiplicationConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageParensConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/SimpleExpressionsTestLanguageSequenceConsumer.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageChoiceRuleConsumer.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TestLanguageReducibleRuleConsumer.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/packrat/consumers/TreeTestLanguageNodeConsumer.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java42
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java64
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/LookaheadTestLanguageParseTreeConstructor.java56
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/OptionalEmptyTestLanguageParseTreeConstructor.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java126
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarTestLanguageParseTreeConstructor.java110
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsTestLanguageParseTreeConstructor.java30
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TestLanguageParseTreeConstructor.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TreeTestLanguageParseTreeConstructor.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java74
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java82
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java140
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java128
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/packrat/consumers/Bug250313Ref2Consumer.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parsetree/reconstr/Bug250313ParseTreeConstructor.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageREALConsumer.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTest.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTestXtextGrammar.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/InterpreterTest.java121
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/TerminalRuleTestLanguageConverters.java6
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xtext3
-rwxr-xr-xtests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java5
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/parser/packrat/consumers/TestLanguageStuffConsumer.java3
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/parsetree/reconstr/TestLanguageParseTreeConstructor.java6
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/services/TestLanguageGrammarAccess.java8
232 files changed, 4304 insertions, 3280 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
index 2fa4957..9fe584c 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
@@ -45,12 +45,15 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
index e31e6d9..d999120 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
@@ -56,24 +56,30 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index 539b885..af8d58a 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -74,36 +74,45 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$16()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$19()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$22()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$25()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$30()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -152,12 +161,15 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$26()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$27()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
index 7e32d1e..fe95548 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
@@ -56,24 +56,30 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
index 4791a38..8d2e2bb 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
@@ -71,28 +71,35 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
final IMarker marker = mark();
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAlternatives$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$26()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
index 3784522..d29dc71 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
@@ -53,24 +53,30 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
index 66deee5..87d317b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
@@ -32,12 +32,12 @@ public class ReferenceGrammarParseTreeConstructor extends AbstractParseTreeConst
/************ begin Rule Spielplatz ****************
*
- * Spielplatz : ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ? ;
+ * Spielplatz : ( "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * "}" ) ? ;
*
**/
-// ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ?
+// ( "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * "}" ) ?
protected class Spielplatz_Group extends GroupToken {
public Spielplatz_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -65,7 +65,7 @@ protected class Spielplatz_Group extends GroupToken {
}
}
-// 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
+// "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
protected class Spielplatz_0_Group extends GroupToken {
public Spielplatz_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -93,7 +93,7 @@ protected class Spielplatz_0_Group extends GroupToken {
}
}
-// 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{'
+// "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{"
protected class Spielplatz_0_0_Group extends GroupToken {
public Spielplatz_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -121,7 +121,7 @@ protected class Spielplatz_0_0_Group extends GroupToken {
}
}
-// 'spielplatz' groesse = INT ( beschreibung = STRING ) ?
+// "spielplatz" groesse = INT ( beschreibung = STRING ) ?
protected class Spielplatz_0_0_0_Group extends GroupToken {
public Spielplatz_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -149,7 +149,7 @@ protected class Spielplatz_0_0_0_Group extends GroupToken {
}
}
-// 'spielplatz' groesse = INT
+// "spielplatz" groesse = INT
protected class Spielplatz_0_0_0_0_Group extends GroupToken {
public Spielplatz_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -177,7 +177,7 @@ protected class Spielplatz_0_0_0_0_Group extends GroupToken {
}
}
-// 'spielplatz'
+// "spielplatz"
protected class Spielplatz_0_0_0_0_0_Keyword_spielplatz extends KeywordToken {
public Spielplatz_0_0_0_0_0_Keyword_spielplatz(IInstanceDescription curr, AbstractToken pred) {
@@ -237,7 +237,7 @@ protected class Spielplatz_0_0_0_1_Assignment_beschreibung extends AssignmentTok
}
-// '{'
+// "{"
protected class Spielplatz_0_0_1_Keyword extends KeywordToken {
public Spielplatz_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -494,7 +494,7 @@ protected class Spielplatz_0_1_1_Assignment_types extends AssignmentToken {
-// '}'
+// "}"
protected class Spielplatz_1_Keyword extends KeywordToken {
public Spielplatz_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -580,12 +580,12 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
/************ begin Rule Kind ****************
*
- * Kind : 'kind' '(' name = ID age = INT ')' ;
+ * Kind : "kind" "(" name = ID age = INT ")" ;
*
**/
-// 'kind' '(' name = ID age = INT ')'
+// "kind" "(" name = ID age = INT ")"
protected class Kind_Group extends GroupToken {
public Kind_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -613,7 +613,7 @@ protected class Kind_Group extends GroupToken {
}
}
-// 'kind' '(' name = ID age = INT
+// "kind" "(" name = ID age = INT
protected class Kind_0_Group extends GroupToken {
public Kind_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -641,7 +641,7 @@ protected class Kind_0_Group extends GroupToken {
}
}
-// 'kind' '(' name = ID
+// "kind" "(" name = ID
protected class Kind_0_0_Group extends GroupToken {
public Kind_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -669,7 +669,7 @@ protected class Kind_0_0_Group extends GroupToken {
}
}
-// 'kind' '('
+// "kind" "("
protected class Kind_0_0_0_Group extends GroupToken {
public Kind_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -697,7 +697,7 @@ protected class Kind_0_0_0_Group extends GroupToken {
}
}
-// 'kind'
+// "kind"
protected class Kind_0_0_0_0_Keyword_kind extends KeywordToken {
public Kind_0_0_0_0_Keyword_kind(IInstanceDescription curr, AbstractToken pred) {
@@ -709,7 +709,7 @@ protected class Kind_0_0_0_0_Keyword_kind extends KeywordToken {
}
}
-// '('
+// "("
protected class Kind_0_0_0_1_Keyword extends KeywordToken {
public Kind_0_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -770,7 +770,7 @@ protected class Kind_0_1_Assignment_age extends AssignmentToken {
}
-// ')'
+// ")"
protected class Kind_1_Keyword extends KeywordToken {
public Kind_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -788,12 +788,12 @@ protected class Kind_1_Keyword extends KeywordToken {
/************ begin Rule Erwachsener ****************
*
- * Erwachsener : 'erwachsener' '(' name = ID age = INT ')' ;
+ * Erwachsener : "erwachsener" "(" name = ID age = INT ")" ;
*
**/
-// 'erwachsener' '(' name = ID age = INT ')'
+// "erwachsener" "(" name = ID age = INT ")"
protected class Erwachsener_Group extends GroupToken {
public Erwachsener_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -821,7 +821,7 @@ protected class Erwachsener_Group extends GroupToken {
}
}
-// 'erwachsener' '(' name = ID age = INT
+// "erwachsener" "(" name = ID age = INT
protected class Erwachsener_0_Group extends GroupToken {
public Erwachsener_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -849,7 +849,7 @@ protected class Erwachsener_0_Group extends GroupToken {
}
}
-// 'erwachsener' '(' name = ID
+// "erwachsener" "(" name = ID
protected class Erwachsener_0_0_Group extends GroupToken {
public Erwachsener_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -877,7 +877,7 @@ protected class Erwachsener_0_0_Group extends GroupToken {
}
}
-// 'erwachsener' '('
+// "erwachsener" "("
protected class Erwachsener_0_0_0_Group extends GroupToken {
public Erwachsener_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -905,7 +905,7 @@ protected class Erwachsener_0_0_0_Group extends GroupToken {
}
}
-// 'erwachsener'
+// "erwachsener"
protected class Erwachsener_0_0_0_0_Keyword_erwachsener extends KeywordToken {
public Erwachsener_0_0_0_0_Keyword_erwachsener(IInstanceDescription curr, AbstractToken pred) {
@@ -917,7 +917,7 @@ protected class Erwachsener_0_0_0_0_Keyword_erwachsener extends KeywordToken {
}
}
-// '('
+// "("
protected class Erwachsener_0_0_0_1_Keyword extends KeywordToken {
public Erwachsener_0_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -978,7 +978,7 @@ protected class Erwachsener_0_1_Assignment_age extends AssignmentToken {
}
-// ')'
+// ")"
protected class Erwachsener_1_Keyword extends KeywordToken {
public Erwachsener_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -996,12 +996,12 @@ protected class Erwachsener_1_Keyword extends KeywordToken {
/************ begin Rule Spielzeug ****************
*
- * Spielzeug : 'spielzeug' '(' name = ID farbe = Farbe ')' ;
+ * Spielzeug : "spielzeug" "(" name = ID farbe = Farbe ")" ;
*
**/
-// 'spielzeug' '(' name = ID farbe = Farbe ')'
+// "spielzeug" "(" name = ID farbe = Farbe ")"
protected class Spielzeug_Group extends GroupToken {
public Spielzeug_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1029,7 +1029,7 @@ protected class Spielzeug_Group extends GroupToken {
}
}
-// 'spielzeug' '(' name = ID farbe = Farbe
+// "spielzeug" "(" name = ID farbe = Farbe
protected class Spielzeug_0_Group extends GroupToken {
public Spielzeug_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1057,7 +1057,7 @@ protected class Spielzeug_0_Group extends GroupToken {
}
}
-// 'spielzeug' '(' name = ID
+// "spielzeug" "(" name = ID
protected class Spielzeug_0_0_Group extends GroupToken {
public Spielzeug_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1085,7 +1085,7 @@ protected class Spielzeug_0_0_Group extends GroupToken {
}
}
-// 'spielzeug' '('
+// "spielzeug" "("
protected class Spielzeug_0_0_0_Group extends GroupToken {
public Spielzeug_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1113,7 +1113,7 @@ protected class Spielzeug_0_0_0_Group extends GroupToken {
}
}
-// 'spielzeug'
+// "spielzeug"
protected class Spielzeug_0_0_0_0_Keyword_spielzeug extends KeywordToken {
public Spielzeug_0_0_0_0_Keyword_spielzeug(IInstanceDescription curr, AbstractToken pred) {
@@ -1125,7 +1125,7 @@ protected class Spielzeug_0_0_0_0_Keyword_spielzeug extends KeywordToken {
}
}
-// '('
+// "("
protected class Spielzeug_0_0_0_1_Keyword extends KeywordToken {
public Spielzeug_0_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1194,7 +1194,7 @@ protected class Spielzeug_0_1_Assignment_farbe extends AssignmentToken {
}
-// ')'
+// ")"
protected class Spielzeug_1_Keyword extends KeywordToken {
public Spielzeug_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1212,12 +1212,12 @@ protected class Spielzeug_1_Keyword extends KeywordToken {
/************ begin Rule Familie ****************
*
- * Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
+ * Familie : "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) * ")" ;
*
**/
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')'
+// "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) * ")"
protected class Familie_Group extends GroupToken {
public Familie_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1245,7 +1245,7 @@ protected class Familie_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) *
+// "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) *
protected class Familie_0_Group extends GroupToken {
public Familie_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1273,7 +1273,7 @@ protected class Familie_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
+// "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
protected class Familie_0_0_Group extends GroupToken {
public Familie_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1301,7 +1301,7 @@ protected class Familie_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
+// "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
protected class Familie_0_0_0_Group extends GroupToken {
public Familie_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1329,7 +1329,7 @@ protected class Familie_0_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ]
+// "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ]
protected class Familie_0_0_0_0_Group extends GroupToken {
public Familie_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1357,7 +1357,7 @@ protected class Familie_0_0_0_0_Group extends GroupToken {
}
}
-// 'familie' '(' name = ( 'keyword' | STRING | ID )
+// "familie" "(" name = ( "keyword" | STRING | ID )
protected class Familie_0_0_0_0_0_Group extends GroupToken {
public Familie_0_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1385,7 +1385,7 @@ protected class Familie_0_0_0_0_0_Group extends GroupToken {
}
}
-// 'familie' '('
+// "familie" "("
protected class Familie_0_0_0_0_0_0_Group extends GroupToken {
public Familie_0_0_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1413,7 +1413,7 @@ protected class Familie_0_0_0_0_0_0_Group extends GroupToken {
}
}
-// 'familie'
+// "familie"
protected class Familie_0_0_0_0_0_0_0_Keyword_familie extends KeywordToken {
public Familie_0_0_0_0_0_0_0_Keyword_familie(IInstanceDescription curr, AbstractToken pred) {
@@ -1425,7 +1425,7 @@ protected class Familie_0_0_0_0_0_0_0_Keyword_familie extends KeywordToken {
}
}
-// '('
+// "("
protected class Familie_0_0_0_0_0_0_1_Keyword extends KeywordToken {
public Familie_0_0_0_0_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1438,7 +1438,7 @@ protected class Familie_0_0_0_0_0_0_1_Keyword extends KeywordToken {
}
-// name = ( 'keyword' | STRING | ID )
+// name = ( "keyword" | STRING | ID )
protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
public Familie_0_0_0_0_0_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1555,7 +1555,7 @@ protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken {
}
-// ( ',' kinder += [ Kind ] ) *
+// ( "," kinder += [ Kind ] ) *
protected class Familie_0_1_Group extends GroupToken {
public Familie_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1583,7 +1583,7 @@ protected class Familie_0_1_Group extends GroupToken {
}
}
-// ','
+// ","
protected class Familie_0_1_0_Keyword extends KeywordToken {
public Familie_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1623,7 +1623,7 @@ protected class Familie_0_1_1_Assignment_kinder extends AssignmentToken {
-// ')'
+// ")"
protected class Familie_1_Keyword extends KeywordToken {
public Familie_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1641,12 +1641,12 @@ protected class Familie_1_Keyword extends KeywordToken {
/************ begin Rule Farbe ****************
*
- * Farbe : wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' ) ;
+ * Farbe : wert = ( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ) ;
*
**/
-// wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' )
+// wert = ( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" )
protected class Farbe_Assignment_wert extends AssignmentToken {
public Farbe_Assignment_wert(IInstanceDescription curr, AbstractToken pred) {
@@ -1697,12 +1697,12 @@ protected class Farbe_Assignment_wert extends AssignmentToken {
/************ begin Rule CustomTypeParserRule ****************
*
- * CustomTypeParserRule returns CustomType : 'type' name = ID ;
+ * CustomTypeParserRule returns CustomType : "type" name = ID ;
*
**/
-// 'type' name = ID
+// "type" name = ID
protected class CustomTypeParserRule_Group extends GroupToken {
public CustomTypeParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1730,7 +1730,7 @@ protected class CustomTypeParserRule_Group extends GroupToken {
}
}
-// 'type'
+// "type"
protected class CustomTypeParserRule_0_Keyword_type extends KeywordToken {
public CustomTypeParserRule_0_Keyword_type(IInstanceDescription curr, AbstractToken pred) {
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 de077d3..4bd5cd6 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
@@ -39,25 +39,25 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final RuleCall c0110ParserRuleCallCustomTypeParserRule = (RuleCall)c011AssignmentTypes.eContents().get(0);
private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
- // Spielplatz : ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ? ;
+ // Spielplatz : ( "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * "}" ) ? ;
public ParserRule getRule() { return rule; }
- // ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ?
+ // ( "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * "}" ) ?
public Group eleGroup() { return cGroup; }
- // 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
+ // "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
public Group ele0Group() { return c0Group; }
- // 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{'
+ // "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{"
public Group ele00Group() { return c00Group; }
- // 'spielplatz' groesse = INT ( beschreibung = STRING ) ?
+ // "spielplatz" groesse = INT ( beschreibung = STRING ) ?
public Group ele000Group() { return c000Group; }
- // 'spielplatz' groesse = INT
+ // "spielplatz" groesse = INT
public Group ele0000Group() { return c0000Group; }
- // 'spielplatz'
+ // "spielplatz"
public Keyword ele00000KeywordSpielplatz() { return c00000KeywordSpielplatz; }
// groesse = INT
@@ -72,7 +72,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// STRING
public RuleCall ele00010LexerRuleCallSTRING() { return c00010LexerRuleCallSTRING; }
- // '{'
+ // "{"
public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
// ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
@@ -117,7 +117,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// CustomTypeParserRule
public RuleCall ele0110ParserRuleCallCustomTypeParserRule() { return c0110ParserRuleCallCustomTypeParserRule; }
- // '}'
+ // "}"
public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
}
@@ -154,25 +154,25 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
- // Kind : 'kind' '(' name = ID age = INT ')' ;
+ // Kind : "kind" "(" name = ID age = INT ")" ;
public ParserRule getRule() { return rule; }
- // 'kind' '(' name = ID age = INT ')'
+ // "kind" "(" name = ID age = INT ")"
public Group eleGroup() { return cGroup; }
- // 'kind' '(' name = ID age = INT
+ // "kind" "(" name = ID age = INT
public Group ele0Group() { return c0Group; }
- // 'kind' '(' name = ID
+ // "kind" "(" name = ID
public Group ele00Group() { return c00Group; }
- // 'kind' '('
+ // "kind" "("
public Group ele000Group() { return c000Group; }
- // 'kind'
+ // "kind"
public Keyword ele0000KeywordKind() { return c0000KeywordKind; }
- // '('
+ // "("
public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
// name = ID
@@ -187,7 +187,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// INT
public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
- // ')'
+ // ")"
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
}
@@ -205,25 +205,25 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
- // Erwachsener : 'erwachsener' '(' name = ID age = INT ')' ;
+ // Erwachsener : "erwachsener" "(" name = ID age = INT ")" ;
public ParserRule getRule() { return rule; }
- // 'erwachsener' '(' name = ID age = INT ')'
+ // "erwachsener" "(" name = ID age = INT ")"
public Group eleGroup() { return cGroup; }
- // 'erwachsener' '(' name = ID age = INT
+ // "erwachsener" "(" name = ID age = INT
public Group ele0Group() { return c0Group; }
- // 'erwachsener' '(' name = ID
+ // "erwachsener" "(" name = ID
public Group ele00Group() { return c00Group; }
- // 'erwachsener' '('
+ // "erwachsener" "("
public Group ele000Group() { return c000Group; }
- // 'erwachsener'
+ // "erwachsener"
public Keyword ele0000KeywordErwachsener() { return c0000KeywordErwachsener; }
- // '('
+ // "("
public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
// name = ID
@@ -238,7 +238,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// INT
public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
- // ')'
+ // ")"
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
}
@@ -256,25 +256,25 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final RuleCall c010ParserRuleCallFarbe = (RuleCall)c01AssignmentFarbe.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
- // Spielzeug : 'spielzeug' '(' name = ID farbe = Farbe ')' ;
+ // Spielzeug : "spielzeug" "(" name = ID farbe = Farbe ")" ;
public ParserRule getRule() { return rule; }
- // 'spielzeug' '(' name = ID farbe = Farbe ')'
+ // "spielzeug" "(" name = ID farbe = Farbe ")"
public Group eleGroup() { return cGroup; }
- // 'spielzeug' '(' name = ID farbe = Farbe
+ // "spielzeug" "(" name = ID farbe = Farbe
public Group ele0Group() { return c0Group; }
- // 'spielzeug' '(' name = ID
+ // "spielzeug" "(" name = ID
public Group ele00Group() { return c00Group; }
- // 'spielzeug' '('
+ // "spielzeug" "("
public Group ele000Group() { return c000Group; }
- // 'spielzeug'
+ // "spielzeug"
public Keyword ele0000KeywordSpielzeug() { return c0000KeywordSpielzeug; }
- // '('
+ // "("
public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
// name = ID
@@ -289,7 +289,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// Farbe
public RuleCall ele010ParserRuleCallFarbe() { return c010ParserRuleCallFarbe; }
- // ')'
+ // ")"
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
}
@@ -322,46 +322,46 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final CrossReference c0110CrossReferenceEStringKind = (CrossReference)c011AssignmentKinder.eContents().get(0);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
- // Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
+ // Familie : "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) * ")" ;
public ParserRule getRule() { return rule; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')'
+ // "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) * ")"
public Group eleGroup() { return cGroup; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) *
+ // "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) *
public Group ele0Group() { return c0Group; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
+ // "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
public Group ele00Group() { return c00Group; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
+ // "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
public Group ele000Group() { return c000Group; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ]
+ // "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ]
public Group ele0000Group() { return c0000Group; }
- // 'familie' '(' name = ( 'keyword' | STRING | ID )
+ // "familie" "(" name = ( "keyword" | STRING | ID )
public Group ele00000Group() { return c00000Group; }
- // 'familie' '('
+ // "familie" "("
public Group ele000000Group() { return c000000Group; }
- // 'familie'
+ // "familie"
public Keyword ele0000000KeywordFamilie() { return c0000000KeywordFamilie; }
- // '('
+ // "("
public Keyword ele0000001KeywordLeftParenthesis() { return c0000001KeywordLeftParenthesis; }
- // name = ( 'keyword' | STRING | ID )
+ // name = ( "keyword" | STRING | ID )
public Assignment ele000001AssignmentName() { return c000001AssignmentName; }
- // 'keyword' | STRING | ID
+ // "keyword" | STRING | ID
public Alternatives ele0000010Alternatives() { return c0000010Alternatives; }
- // 'keyword' | STRING
+ // "keyword" | STRING
public Alternatives ele00000100Alternatives() { return c00000100Alternatives; }
- // 'keyword'
+ // "keyword"
public Keyword ele000001000KeywordKeyword() { return c000001000KeywordKeyword; }
// STRING
@@ -388,10 +388,10 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// [ Kind ]
public CrossReference ele0010CrossReferenceEStringKind() { return c0010CrossReferenceEStringKind; }
- // ( ',' kinder += [ Kind ] ) *
+ // ( "," kinder += [ Kind ] ) *
public Group ele01Group() { return c01Group; }
- // ','
+ // ","
public Keyword ele010KeywordComma() { return c010KeywordComma; }
// kinder += [ Kind ]
@@ -400,7 +400,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
// [ Kind ]
public CrossReference ele0110CrossReferenceEStringKind() { return c0110CrossReferenceEStringKind; }
- // ')'
+ // ")"
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
}
@@ -415,31 +415,31 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final Keyword c001KeywordGELB = (Keyword)c00Alternatives.eContents().get(1);
private final Keyword c01KeywordGRÜN = (Keyword)c0Alternatives.eContents().get(1);
- // Farbe : wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' ) ;
+ // Farbe : wert = ( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ) ;
public ParserRule getRule() { return rule; }
- // wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' )
+ // wert = ( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" )
public Assignment eleAssignmentWert() { return cAssignmentWert; }
- // 'ROT' | 'BLAU' | 'GELB' | 'GRÜN'
+ // "ROT" | "BLAU" | "GELB" | "GR\u00DCN"
public Alternatives ele0Alternatives() { return c0Alternatives; }
- // 'ROT' | 'BLAU' | 'GELB'
+ // "ROT" | "BLAU" | "GELB"
public Alternatives ele00Alternatives() { return c00Alternatives; }
- // 'ROT' | 'BLAU'
+ // "ROT" | "BLAU"
public Alternatives ele000Alternatives() { return c000Alternatives; }
- // 'ROT'
+ // "ROT"
public Keyword ele0000KeywordROT() { return c0000KeywordROT; }
- // 'BLAU'
+ // "BLAU"
public Keyword ele0001KeywordBLAU() { return c0001KeywordBLAU; }
- // 'GELB'
+ // "GELB"
public Keyword ele001KeywordGELB() { return c001KeywordGELB; }
- // 'GRÜN'
+ // "GR\u00DCN"
public Keyword ele01KeywordGRÜN() { return c01KeywordGRÜN; }
}
@@ -450,13 +450,13 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
- // CustomTypeParserRule returns CustomType : 'type' name = ID ;
+ // CustomTypeParserRule returns CustomType : "type" name = ID ;
public ParserRule getRule() { return rule; }
- // 'type' name = ID
+ // "type" name = ID
public Group eleGroup() { return cGroup; }
- // 'type'
+ // "type"
public Keyword ele0KeywordType() { return c0KeywordType; }
// name = ID
@@ -494,7 +494,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
}
- // Spielplatz : ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ? ;
+ // Spielplatz : ( "spielplatz" groesse = INT ( beschreibung = STRING ) ? "{" ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * "}" ) ? ;
public SpielplatzElements prSpielplatz() {
return (pSpielplatz != null) ? pSpielplatz : (pSpielplatz = new SpielplatzElements());
}
@@ -504,32 +504,32 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements
return (pPerson != null) ? pPerson : (pPerson = new PersonElements());
}
- // Kind : 'kind' '(' name = ID age = INT ')' ;
+ // Kind : "kind" "(" name = ID age = INT ")" ;
public KindElements prKind() {
return (pKind != null) ? pKind : (pKind = new KindElements());
}
- // Erwachsener : 'erwachsener' '(' name = ID age = INT ')' ;
+ // Erwachsener : "erwachsener" "(" name = ID age = INT ")" ;
public ErwachsenerElements prErwachsener() {
return (pErwachsener != null) ? pErwachsener : (pErwachsener = new ErwachsenerElements());
}
- // Spielzeug : 'spielzeug' '(' name = ID farbe = Farbe ')' ;
+ // Spielzeug : "spielzeug" "(" name = ID farbe = Farbe ")" ;
public SpielzeugElements prSpielzeug() {
return (pSpielzeug != null) ? pSpielzeug : (pSpielzeug = new SpielzeugElements());
}
- // Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
+ // Familie : "familie" "(" name = ( "keyword" | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( "," kinder += [ Kind ] ) * ")" ;
public FamilieElements prFamilie() {
return (pFamilie != null) ? pFamilie : (pFamilie = new FamilieElements());
}
- // Farbe : wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' ) ;
+ // Farbe : wert = ( "ROT" | "BLAU" | "GELB" | "GR\u00DCN" ) ;
public FarbeElements prFarbe() {
return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements());
}
- // CustomTypeParserRule returns CustomType : 'type' name = ID ;
+ // CustomTypeParserRule returns CustomType : "type" name = ID ;
public CustomTypeParserRuleElements prCustomTypeParserRule() {
return (pCustomTypeParserRule != null) ? pCustomTypeParserRule : (pCustomTypeParserRule = new CustomTypeParserRuleElements());
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/DomainmodelGenProposalProvider.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/DomainmodelGenProposalProvider.java
index d5f5a24..b0f825d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/DomainmodelGenProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/DomainmodelGenProposalProvider.java
@@ -24,14 +24,6 @@ public class DomainmodelGenProposalProvider extends AbstractProposalProvider {
private static final String UI_PLUGIN_ID = "org.eclipse.xtext.example.domainmodel.ui";
- public List<? extends ICompletionProposal> completeFileImports(Assignment assignment, IContentAssistContext contentAssistContext) {
- if (logger.isDebugEnabled()) {
- logger.debug("completeFileImports feature '" + assignment.getFeature() + "' terminal '"
- + assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
- + contentAssistContext.getMatchString().trim() + "'");
- }
- return Collections.emptyList();
- }
public List<? extends ICompletionProposal> completeFileNamedElements(Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -206,13 +198,6 @@ public class DomainmodelGenProposalProvider extends AbstractProposalProvider {
}
- public List<? extends ICompletionProposal> complete(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
- if (logger.isDebugEnabled()) {
- logger.debug("complete '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
- + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
- }
- return Collections.emptyList();
- }
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 30ffc46..287abca 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
@@ -40,14 +40,14 @@ public class InternalDomainmodelLexer extends Lexer {
public InternalDomainmodelLexer(CharStream input) {
super(input);
}
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g"; }
// $ANTLR start T11
public final void mT11() throws RecognitionException {
try {
int _type = T11;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:10:5: ( 'import' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:10:7: 'import'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:10:5: ( 'import' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:10:7: 'import'
{
match("import");
@@ -65,8 +65,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:11:5: ( 'package' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:11:7: 'package'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:11:5: ( 'package' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:11:7: 'package'
{
match("package");
@@ -84,8 +84,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT13() throws RecognitionException {
try {
int _type = T13;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:12:5: ( '{' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:12:7: '{'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:12:5: ( '{' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:12:7: '{'
{
match('{');
@@ -102,8 +102,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:13:5: ( '}' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:13:7: '}'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:13:5: ( '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:13:7: '}'
{
match('}');
@@ -120,8 +120,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:14:5: ( 'datatype' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:14:7: 'datatype'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:14:5: ( 'datatype' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:14:7: 'datatype'
{
match("datatype");
@@ -139,8 +139,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT16() throws RecognitionException {
try {
int _type = T16;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:15:5: ( 'entity' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:15:7: 'entity'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:15:5: ( 'entity' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:15:7: 'entity'
{
match("entity");
@@ -158,8 +158,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT17() throws RecognitionException {
try {
int _type = T17;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:16:5: ( 'extends' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:16:7: 'extends'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:16:5: ( 'extends' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:16:7: 'extends'
{
match("extends");
@@ -177,8 +177,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT18() throws RecognitionException {
try {
int _type = T18;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:17:5: ( 'attr' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:17:7: 'attr'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:17:5: ( 'attr' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:17:7: 'attr'
{
match("attr");
@@ -196,8 +196,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT19() throws RecognitionException {
try {
int _type = T19;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:18:5: ( ':' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:18:7: ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:18:5: ( ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:18:7: ':'
{
match(':');
@@ -214,8 +214,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT20() throws RecognitionException {
try {
int _type = T20;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:19:5: ( 'ref' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:19:7: 'ref'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:19:5: ( 'ref' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:19:7: 'ref'
{
match("ref");
@@ -233,8 +233,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT21() throws RecognitionException {
try {
int _type = T21;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:20:5: ( 'opposite' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:20:7: 'opposite'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:20:5: ( 'opposite' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:20:7: 'opposite'
{
match("opposite");
@@ -252,8 +252,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT22() throws RecognitionException {
try {
int _type = T22;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:21:5: ( 'op' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:21:7: 'op'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:21:5: ( 'op' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:21:7: 'op'
{
match("op");
@@ -271,8 +271,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT23() throws RecognitionException {
try {
int _type = T23;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:22:5: ( '(' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:22:7: '('
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:22:5: ( '(' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:22:7: '('
{
match('(');
@@ -289,8 +289,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT24() throws RecognitionException {
try {
int _type = T24;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:23:5: ( ',' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:23:7: ','
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:23:5: ( ',' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:23:7: ','
{
match(',');
@@ -307,8 +307,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT25() throws RecognitionException {
try {
int _type = T25;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:24:5: ( ')' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:24:7: ')'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:24:5: ( ')' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:24:7: ')'
{
match(')');
@@ -325,8 +325,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mT26() throws RecognitionException {
try {
int _type = T26;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:25:5: ( '.' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:25:7: '.'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:25:5: ( '.' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:25:7: '.'
{
match('.');
@@ -343,10 +343,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020: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:1020: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:1020:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:11: ( '^' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -355,7 +355,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:12: '^'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:12: '^'
{
match('^');
@@ -374,7 +374,7 @@ public class InternalDomainmodelLexer extends Lexer {
recover(mse); throw mse;
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1020:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -387,7 +387,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
@@ -422,10 +422,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:10: ( ( '0' .. '9' )+ )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:12: ( '0' .. '9' )+
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -439,7 +439,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:13: '0' .. '9'
{
matchRange('0','9');
@@ -469,7 +469,7 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024: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:1024:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -487,10 +487,10 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
{
match('\"');
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
loop4:
do {
int alt4=3;
@@ -506,7 +506,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -523,7 +523,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:65: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:65: ~ ( '\\\\' | '\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -549,10 +549,10 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
loop5:
do {
int alt5=3;
@@ -568,7 +568,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -585,7 +585,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:152: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:152: ~ ( '\\\\' | '\\'' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -623,12 +623,12 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -653,7 +653,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:52: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:52: .
{
matchAny();
@@ -682,12 +682,12 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:24: (~ ( '\\n' | '\\r' ) )*
loop8:
do {
int alt8=2;
@@ -700,7 +700,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028: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();
@@ -721,7 +721,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:38: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -730,9 +730,9 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: ( '\\r' )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -741,7 +741,7 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: '\\r'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:39: '\\r'
{
match('\r');
@@ -772,10 +772,10 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1030:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -789,7 +789,7 @@ public class InternalDomainmodelLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -829,8 +829,8 @@ public class InternalDomainmodelLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1032:16: ( . )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1032:18: .
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1032:16: ( . )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1032:18: .
{
matchAny();
@@ -844,7 +844,7 @@ public class InternalDomainmodelLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=23;
int LA12_0 = input.LA(1);
@@ -1316,161 +1316,161 @@ public class InternalDomainmodelLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:10: T11
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:10: T11
{
mT11();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:14: T12
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:14: T12
{
mT12();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:18: T13
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:18: T13
{
mT13();
}
break;
case 4 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:22: T14
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:22: T14
{
mT14();
}
break;
case 5 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:26: T15
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:26: T15
{
mT15();
}
break;
case 6 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:30: T16
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:30: T16
{
mT16();
}
break;
case 7 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:34: T17
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:34: T17
{
mT17();
}
break;
case 8 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:38: T18
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:38: T18
{
mT18();
}
break;
case 9 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:42: T19
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:42: T19
{
mT19();
}
break;
case 10 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:46: T20
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:46: T20
{
mT20();
}
break;
case 11 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:50: T21
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:50: T21
{
mT21();
}
break;
case 12 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:54: T22
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:54: T22
{
mT22();
}
break;
case 13 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:58: T23
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:58: T23
{
mT23();
}
break;
case 14 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:62: T24
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:62: T24
{
mT24();
}
break;
case 15 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:66: T25
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:66: T25
{
mT25();
}
break;
case 16 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:70: T26
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:70: T26
{
mT26();
}
break;
case 17 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:74: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:74: RULE_ID
{
mRULE_ID();
}
break;
case 18 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:82: RULE_INT
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:82: RULE_INT
{
mRULE_INT();
}
break;
case 19 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:91: RULE_STRING
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:91: RULE_STRING
{
mRULE_STRING();
}
break;
case 20 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:103: RULE_ML_COMMENT
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:103: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 21 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:119: RULE_SL_COMMENT
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:119: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 22 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:135: RULE_WS
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:135: RULE_WS
{
mRULE_WS();
}
break;
case 23 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:143: RULE_ANY_OTHER
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1:143: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
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 b8db666..c5012e1 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
@@ -39,7 +39,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
public String[] getTokenNames() { return tokenNames; }
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g"; }
@@ -63,7 +63,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleFile
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:68:1: entryRuleFile returns [EObject current=null] : iv_ruleFile= ruleFile EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:68:1: entryRuleFile returns [EObject current=null] : iv_ruleFile= ruleFile EOF ;
public final EObject entryRuleFile() throws RecognitionException {
EObject current = null;
@@ -71,8 +71,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:68:46: (iv_ruleFile= ruleFile EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:69:2: iv_ruleFile= ruleFile EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:68:46: (iv_ruleFile= ruleFile EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:69:2: iv_ruleFile= ruleFile EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.0" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleFile_in_entryRuleFile72);
@@ -98,7 +98,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleFile
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:76:1: ruleFile returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:76:1: ruleFile returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) ;
public final EObject ruleFile() throws RecognitionException {
EObject current = null;
@@ -110,13 +110,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:80:6: ( ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:80:6: ( ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:2: (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:2: (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )*
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:2: (lv_imports= ruleImport )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:81:2: (lv_imports= ruleImport )*
loop1:
do {
int alt1=2;
@@ -129,7 +129,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:6: lv_imports= ruleImport
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:6: lv_imports= ruleImport
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.0/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode);
@@ -160,7 +160,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:102:3: (lv_namedElements= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:102:3: (lv_namedElements= ruleNamedElement )*
loop2:
do {
int alt2=2;
@@ -173,7 +173,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:105:6: lv_namedElements= ruleNamedElement
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:105:6: lv_namedElements= ruleNamedElement
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -226,7 +226,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleImport
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
public final EObject entryRuleImport() throws RecognitionException {
EObject current = null;
@@ -234,8 +234,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:48: (iv_ruleImport= ruleImport EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:133:2: iv_ruleImport= ruleImport EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:48: (iv_ruleImport= ruleImport EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:133:2: iv_ruleImport= ruleImport EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.1" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleImport_in_entryRuleImport220);
@@ -261,7 +261,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleImport
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:140:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:140:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ;
public final EObject ruleImport() throws RecognitionException {
EObject current = null;
@@ -270,18 +270,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:144:6: ( ( 'import' (lv_importURI= RULE_STRING ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:1: ( 'import' (lv_importURI= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:144:6: ( ( 'import' (lv_importURI= RULE_STRING ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:1: ( 'import' (lv_importURI= RULE_STRING ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:1: ( 'import' (lv_importURI= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:2: 'import' (lv_importURI= RULE_STRING )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:1: ( 'import' (lv_importURI= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:145:2: 'import' (lv_importURI= RULE_STRING )
{
match(input,11,FOLLOW_11_in_ruleImport264);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.1/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:149:1: (lv_importURI= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:151:6: lv_importURI= RULE_STRING
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:149:1: (lv_importURI= RULE_STRING )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:151:6: lv_importURI= RULE_STRING
{
lv_importURI=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285);
@@ -325,7 +325,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleNamedElement
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ;
public final EObject entryRuleNamedElement() throws RecognitionException {
EObject current = null;
@@ -333,8 +333,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:54: (iv_ruleNamedElement= ruleNamedElement EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:179:2: iv_ruleNamedElement= ruleNamedElement EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:54: (iv_ruleNamedElement= ruleNamedElement EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:179:2: iv_ruleNamedElement= ruleNamedElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.2" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement331);
@@ -360,7 +360,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleNamedElement
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:186:1: ruleNamedElement returns [EObject current=null] : (this_Package= rulePackage | this_Type= ruleType ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:186:1: ruleNamedElement returns [EObject current=null] : (this_Package= rulePackage | this_Type= ruleType ) ;
public final EObject ruleNamedElement() throws RecognitionException {
EObject current = null;
@@ -372,10 +372,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:190:6: ( (this_Package= rulePackage | this_Type= ruleType ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:191:1: (this_Package= rulePackage | this_Type= ruleType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:190:6: ( (this_Package= rulePackage | this_Type= ruleType ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:191:1: (this_Package= rulePackage | this_Type= ruleType )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:191:1: (this_Package= rulePackage | this_Type= ruleType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:191:1: (this_Package= rulePackage | this_Type= ruleType )
int alt3=2;
int LA3_0 = input.LA(1);
@@ -393,7 +393,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:192:5: this_Package= rulePackage
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:192:5: this_Package= rulePackage
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.2/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -410,7 +410,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:202:5: this_Type= ruleType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:202:5: this_Type= ruleType
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.2/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -448,7 +448,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRulePackage
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:219: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:219:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ;
public final EObject entryRulePackage() throws RecognitionException {
EObject current = null;
@@ -456,8 +456,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:219:49: (iv_rulePackage= rulePackage EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:220:2: iv_rulePackage= rulePackage EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:219:49: (iv_rulePackage= rulePackage EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:220:2: iv_rulePackage= rulePackage EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.3" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_rulePackage_in_entryRulePackage449);
@@ -483,7 +483,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start rulePackage
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:227:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:227:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) ;
public final EObject rulePackage() throws RecognitionException {
EObject current = null;
@@ -495,27 +495,27 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:231:6: ( ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:231:6: ( ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )*
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:4: ( 'package' (lv_name= ruleQualifiedName ) ) '{'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:4: ( 'package' (lv_name= ruleQualifiedName ) ) '{'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:4: ( 'package' (lv_name= ruleQualifiedName ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:5: 'package' (lv_name= ruleQualifiedName )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:4: ( 'package' (lv_name= ruleQualifiedName ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:5: 'package' (lv_name= ruleQualifiedName )
{
match(input,12,FOLLOW_12_in_rulePackage496);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:236:1: (lv_name= ruleQualifiedName )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:6: lv_name= ruleQualifiedName
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:236:1: (lv_name= ruleQualifiedName )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:6: lv_name= ruleQualifiedName
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -550,7 +550,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:261:2: (lv_namedElements= ruleNamedElement )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:261:2: (lv_namedElements= ruleNamedElement )*
loop4:
do {
int alt4=2;
@@ -563,7 +563,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:264:6: lv_namedElements= ruleNamedElement
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:264:6: lv_namedElements= ruleNamedElement
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -623,7 +623,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleType
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:295: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:295:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
public final EObject entryRuleType() throws RecognitionException {
EObject current = null;
@@ -631,8 +631,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:295:46: (iv_ruleType= ruleType EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:296:2: iv_ruleType= ruleType EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:295:46: (iv_ruleType= ruleType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:296:2: iv_ruleType= ruleType EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.4" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleType_in_entryRuleType629);
@@ -658,7 +658,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleType
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:303:1: ruleType returns [EObject current=null] : (this_Entity= ruleEntity | this_DataType= ruleDataType ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:303:1: ruleType returns [EObject current=null] : (this_Entity= ruleEntity | this_DataType= ruleDataType ) ;
public final EObject ruleType() throws RecognitionException {
EObject current = null;
@@ -670,10 +670,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:307:6: ( (this_Entity= ruleEntity | this_DataType= ruleDataType ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:308:1: (this_Entity= ruleEntity | this_DataType= ruleDataType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:307:6: ( (this_Entity= ruleEntity | this_DataType= ruleDataType ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:308:1: (this_Entity= ruleEntity | this_DataType= ruleDataType )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:308:1: (this_Entity= ruleEntity | this_DataType= ruleDataType )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:308:1: (this_Entity= ruleEntity | this_DataType= ruleDataType )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -691,7 +691,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:309:5: this_Entity= ruleEntity
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:309:5: this_Entity= ruleEntity
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.4/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -708,7 +708,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:319:5: this_DataType= ruleDataType
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:319:5: this_DataType= ruleDataType
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.4/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -746,7 +746,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleDataType
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:336: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:336:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ;
public final EObject entryRuleDataType() throws RecognitionException {
EObject current = null;
@@ -754,8 +754,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:336:50: (iv_ruleDataType= ruleDataType EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:337:2: iv_ruleDataType= ruleDataType EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:336:50: (iv_ruleDataType= ruleDataType EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:337:2: iv_ruleDataType= ruleDataType EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.5" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType747);
@@ -781,7 +781,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleDataType
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:344:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name= RULE_ID ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:344:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name= RULE_ID ) ) ;
public final EObject ruleDataType() throws RecognitionException {
EObject current = null;
@@ -790,18 +790,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:348:6: ( ( 'datatype' (lv_name= RULE_ID ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:1: ( 'datatype' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:348:6: ( ( 'datatype' (lv_name= RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:1: ( 'datatype' (lv_name= RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:1: ( 'datatype' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:2: 'datatype' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:1: ( 'datatype' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:2: 'datatype' (lv_name= RULE_ID )
{
match(input,15,FOLLOW_15_in_ruleDataType791);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.5/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:353:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:355:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:353:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:355:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType812);
@@ -845,7 +845,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEntity
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:382: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:382:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ;
public final EObject entryRuleEntity() throws RecognitionException {
EObject current = null;
@@ -853,8 +853,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:382:48: (iv_ruleEntity= ruleEntity EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:383:2: iv_ruleEntity= ruleEntity EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:382:48: (iv_ruleEntity= ruleEntity EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:383:2: iv_ruleEntity= ruleEntity EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.6" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity858);
@@ -880,7 +880,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEntity
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) ;
public final EObject ruleEntity() throws RecognitionException {
EObject current = null;
@@ -891,30 +891,30 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:394:6: ( ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:394:6: ( ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )*
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:5: ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:5: ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )?
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:5: ( 'entity' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:6: 'entity' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:5: ( 'entity' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:395:6: 'entity' (lv_name= RULE_ID )
{
match(input,16,FOLLOW_16_in_ruleEntity906);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:399:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:401:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:399:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:401:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity927);
@@ -939,7 +939,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:419:3: ( 'extends' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:419:3: ( 'extends' ( ( RULE_ID ) ) )?
int alt6=2;
int LA6_0 = input.LA(1);
@@ -948,14 +948,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:419:4: 'extends' ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:419:4: 'extends' ( ( RULE_ID ) )
{
match(input,17,FOLLOW_17_in_ruleEntity949);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:423:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:426:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:423:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:426:3: ( RULE_ID )
{
if (current==null) {
@@ -963,8 +963,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:433:2: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:433:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity973);
@@ -992,7 +992,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:442:2: (lv_features= ruleFeature )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:442:2: (lv_features= ruleFeature )*
loop7:
do {
int alt7=2;
@@ -1005,7 +1005,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:445:6: lv_features= ruleFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:445:6: lv_features= ruleFeature
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1065,7 +1065,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleFeature
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:476: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:476:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
public final EObject entryRuleFeature() throws RecognitionException {
EObject current = null;
@@ -1073,8 +1073,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:476:49: (iv_ruleFeature= ruleFeature EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:477:2: iv_ruleFeature= ruleFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:476:49: (iv_ruleFeature= ruleFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:477:2: iv_ruleFeature= ruleFeature EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.7" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1074);
@@ -1100,7 +1100,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleFeature
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:484:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:484:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) ;
public final EObject ruleFeature() throws RecognitionException {
EObject current = null;
@@ -1112,10 +1112,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:488:6: ( (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:489:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:488:6: ( (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:489:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:489:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:489:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -1133,7 +1133,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:490:5: this_StructuralFeature= ruleStructuralFeature
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:490:5: this_StructuralFeature= ruleStructuralFeature
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.7/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -1150,7 +1150,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:5: this_Operation= ruleOperation
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:5: this_Operation= ruleOperation
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.7/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -1188,7 +1188,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleStructuralFeature
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:517: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:517:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ;
public final EObject entryRuleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1196,8 +1196,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:517:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:518:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:517:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:518:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.8" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1192);
@@ -1223,7 +1223,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleStructuralFeature
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:525:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute= ruleAttribute | this_Reference= ruleReference ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:525:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute= ruleAttribute | this_Reference= ruleReference ) ;
public final EObject ruleStructuralFeature() throws RecognitionException {
EObject current = null;
@@ -1235,10 +1235,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:529:6: ( (this_Attribute= ruleAttribute | this_Reference= ruleReference ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:530:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:529:6: ( (this_Attribute= ruleAttribute | this_Reference= ruleReference ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:530:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:530:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:530:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference )
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1256,7 +1256,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:531:5: this_Attribute= ruleAttribute
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:531:5: this_Attribute= ruleAttribute
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.8/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -1273,7 +1273,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:541:5: this_Reference= ruleReference
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:541:5: this_Reference= ruleReference
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.8/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -1311,7 +1311,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleAttribute
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:558: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:558:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
public final EObject entryRuleAttribute() throws RecognitionException {
EObject current = null;
@@ -1319,8 +1319,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:558:51: (iv_ruleAttribute= ruleAttribute EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:559:2: iv_ruleAttribute= ruleAttribute EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:558:51: (iv_ruleAttribute= ruleAttribute EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:559:2: iv_ruleAttribute= ruleAttribute EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.9" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1310);
@@ -1346,7 +1346,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleAttribute
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:566:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:566:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ;
public final EObject ruleAttribute() throws RecognitionException {
EObject current = null;
@@ -1357,24 +1357,24 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:6: ( ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:6: ( ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:3: ( 'attr' (lv_name= RULE_ID ) ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:3: ( 'attr' (lv_name= RULE_ID ) ) ':'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:3: ( 'attr' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:4: 'attr' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:3: ( 'attr' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:4: 'attr' (lv_name= RULE_ID )
{
match(input,18,FOLLOW_18_in_ruleAttribute1356);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.9/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:575:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:577:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:575:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:577:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1377);
@@ -1406,8 +1406,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:599:2: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:602:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:599:2: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:602:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.9/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1454,7 +1454,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleReference
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:629: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:629:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
public final EObject entryRuleReference() throws RecognitionException {
EObject current = null;
@@ -1462,8 +1462,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:629:51: (iv_ruleReference= ruleReference EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:630:2: iv_ruleReference= ruleReference EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:629:51: (iv_ruleReference= ruleReference EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:630:2: iv_ruleReference= ruleReference EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.10" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleReference_in_entryRuleReference1472);
@@ -1489,7 +1489,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleReference
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:637:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:637:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) ;
public final EObject ruleReference() throws RecognitionException {
EObject current = null;
@@ -1500,27 +1500,27 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:641:6: ( ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:641:6: ( ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )?
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:4: ( 'ref' (lv_name= RULE_ID ) ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:4: ( 'ref' (lv_name= RULE_ID ) ) ':'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:4: ( 'ref' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:5: 'ref' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:4: ( 'ref' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:5: 'ref' (lv_name= RULE_ID )
{
match(input,20,FOLLOW_20_in_ruleReference1519);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.10/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:646:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:648:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:646:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:648:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1540);
@@ -1552,8 +1552,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:670:2: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:673:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:670:2: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:673:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.10/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1581,7 +1581,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:691:3: ( 'opposite' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:691:3: ( 'opposite' ( ( RULE_ID ) ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1590,14 +1590,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:691:4: 'opposite' ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:691:4: 'opposite' ( ( RULE_ID ) )
{
match(input,21,FOLLOW_21_in_ruleReference1611);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.10/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:695:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:698:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:695:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:698:3: ( RULE_ID )
{
if (current==null) {
@@ -1605,8 +1605,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:704:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:2: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:704:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1635);
@@ -1646,7 +1646,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleOperation
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:719: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:719:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ;
public final EObject entryRuleOperation() throws RecognitionException {
EObject current = null;
@@ -1654,8 +1654,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:719:51: (iv_ruleOperation= ruleOperation EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:720:2: iv_ruleOperation= ruleOperation EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:719:51: (iv_ruleOperation= ruleOperation EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:720:2: iv_ruleOperation= ruleOperation EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1676);
@@ -1681,7 +1681,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleOperation
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:727:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:727:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) ;
public final EObject ruleOperation() throws RecognitionException {
EObject current = null;
@@ -1694,33 +1694,33 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:731:6: ( ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:731:6: ( ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')'
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')'
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )?
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:6: ( 'op' (lv_name= RULE_ID ) ) '('
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:6: ( 'op' (lv_name= RULE_ID ) ) '('
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:6: ( 'op' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:7: 'op' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:6: ( 'op' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:732:7: 'op' (lv_name= RULE_ID )
{
match(input,22,FOLLOW_22_in_ruleOperation1725);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:736:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:738:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:736:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:738:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1746);
@@ -1752,7 +1752,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:2: ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )?
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:2: ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1761,10 +1761,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:3: (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:3: (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )*
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:3: (lv_params= ruleParameter )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:763:6: lv_params= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:760:3: (lv_params= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:763:6: lv_params= ruleParameter
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1789,7 +1789,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:781:2: ( ',' (lv_params= ruleParameter ) )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:781:2: ( ',' (lv_params= ruleParameter ) )*
loop11:
do {
int alt11=2;
@@ -1802,14 +1802,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:781:3: ',' (lv_params= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:781:3: ',' (lv_params= ruleParameter )
{
match(input,24,FOLLOW_24_in_ruleOperation1817);
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:1: (lv_params= ruleParameter )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:788:6: lv_params= ruleParameter
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:1: (lv_params= ruleParameter )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:788:6: lv_params= ruleParameter
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1866,8 +1866,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:814:2: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:817:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:814:2: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:817:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.11/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1914,7 +1914,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleParameter
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:844: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:844:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
public final EObject entryRuleParameter() throws RecognitionException {
EObject current = null;
@@ -1922,8 +1922,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:844:51: (iv_ruleParameter= ruleParameter EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:845:2: iv_ruleParameter= ruleParameter EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:844:51: (iv_ruleParameter= ruleParameter EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:845:2: iv_ruleParameter= ruleParameter EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.12" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1953);
@@ -1949,7 +1949,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleParameter
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:852:1: ruleParameter returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:852:1: ruleParameter returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) ;
public final EObject ruleParameter() throws RecognitionException {
EObject current = null;
@@ -1960,14 +1960,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:856:6: ( ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:856:6: ( ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:2: (lv_name= RULE_ID ) (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:2: (lv_name= RULE_ID ) (lv_type= ruleTypeRef )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:2: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:857:2: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter2009);
@@ -1989,8 +1989,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:877:2: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:880:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:877:2: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:880:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.12/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -2037,7 +2037,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleTypeRef
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:909: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:909:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
public final EObject entryRuleTypeRef() throws RecognitionException {
EObject current = null;
@@ -2045,8 +2045,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:909:49: (iv_ruleTypeRef= ruleTypeRef EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:910:2: iv_ruleTypeRef= ruleTypeRef EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:909:49: (iv_ruleTypeRef= ruleTypeRef EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:910:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.14" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2095);
@@ -2072,18 +2072,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleTypeRef
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:917:1: ruleTypeRef returns [EObject current=null] : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:917:1: ruleTypeRef returns [EObject current=null] : ( ( RULE_ID ) ) ;
public final EObject ruleTypeRef() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:921:6: ( ( ( RULE_ID ) ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:922:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:921:6: ( ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:922:1: ( ( RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:922:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:925:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:922:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:925:3: ( RULE_ID )
{
if (current==null) {
@@ -2091,8 +2091,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:931:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:2: RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:931:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2153);
@@ -2123,7 +2123,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleQualifiedName
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:946: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:946:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
public final String entryRuleQualifiedName() throws RecognitionException {
String current = null;
@@ -2131,8 +2131,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:946:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:947:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:946:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:947:2: iv_ruleQualifiedName= ruleQualifiedName EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.15" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2192);
@@ -2158,7 +2158,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleQualifiedName
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:954:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) ;
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:954:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) ;
public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -2168,11 +2168,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:6: ( (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:6: ( (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* )
{
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* )
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:6: this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* )
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:6: this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )*
{
this_ID=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2243);
@@ -2182,7 +2182,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
createLeafNode("classpath:/org/eclipse/xtext/example/Domainmodel.xmi#//@rules.15/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, null);
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:1: (kw= '.' this_ID= RULE_ID )*
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:1: (kw= '.' this_ID= RULE_ID )*
loop13:
do {
int alt13=2;
@@ -2195,7 +2195,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:967:2: kw= '.' this_ID= RULE_ID
+ // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:967:2: kw= '.' this_ID= RULE_ID
{
kw=(Token)input.LT(1);
match(input,26,FOLLOW_26_in_ruleQualifiedName2262);
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 9d8acc3..b170841 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 "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
RULE_INT : ('0'..'9')+;
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
RULE_ANY_OTHER : .;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index db94c03..e6af455 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -50,20 +50,25 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index f5c0035..8576696 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -45,12 +45,15 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index 099d3b9..0ec7dac 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -59,28 +59,35 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$14()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$17()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -103,12 +110,15 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
index 7ab0ad8..c2ecafe 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
@@ -41,12 +41,15 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
index 8aa1c72..8f7ec03 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
@@ -45,12 +45,15 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
index da5c32d..c65589e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
@@ -61,32 +61,40 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$18()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$19()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$20()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -113,12 +121,15 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$14()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -137,12 +148,15 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$16()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
index 45fdc05..05c1456 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
@@ -50,24 +50,30 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
index 6e71fe5..ff551ee 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
@@ -44,12 +44,15 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
index f536b29..44aba5c 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
@@ -48,12 +48,15 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -70,12 +73,15 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index e3ac949..2cb3eb3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -56,24 +56,30 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -106,12 +112,15 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$13()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
index 3479bcd..04ff413 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
@@ -140,12 +140,12 @@ protected class File_1_Assignment_namedElements extends AssignmentToken {
/************ begin Rule Import ****************
*
- * Import : 'import' importURI = STRING ;
+ * Import : "import" importURI = STRING ;
*
**/
-// 'import' importURI = STRING
+// "import" importURI = STRING
protected class Import_Group extends GroupToken {
public Import_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -173,7 +173,7 @@ protected class Import_Group extends GroupToken {
}
}
-// 'import'
+// "import"
protected class Import_0_Keyword_import extends KeywordToken {
public Import_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
@@ -282,12 +282,12 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
/************ begin Rule Package ****************
*
- * Package : 'package' name = QualifiedName '{' ( namedElements += NamedElement ) * '}' ;
+ * Package : "package" name = QualifiedName "{" ( namedElements += NamedElement ) * "}" ;
*
**/
-// 'package' name = QualifiedName '{' ( namedElements += NamedElement ) * '}'
+// "package" name = QualifiedName "{" ( namedElements += NamedElement ) * "}"
protected class Package_Group extends GroupToken {
public Package_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -315,7 +315,7 @@ protected class Package_Group extends GroupToken {
}
}
-// 'package' name = QualifiedName '{' ( namedElements += NamedElement ) *
+// "package" name = QualifiedName "{" ( namedElements += NamedElement ) *
protected class Package_0_Group extends GroupToken {
public Package_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -343,7 +343,7 @@ protected class Package_0_Group extends GroupToken {
}
}
-// 'package' name = QualifiedName '{'
+// "package" name = QualifiedName "{"
protected class Package_0_0_Group extends GroupToken {
public Package_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -371,7 +371,7 @@ protected class Package_0_0_Group extends GroupToken {
}
}
-// 'package' name = QualifiedName
+// "package" name = QualifiedName
protected class Package_0_0_0_Group extends GroupToken {
public Package_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -399,7 +399,7 @@ protected class Package_0_0_0_Group extends GroupToken {
}
}
-// 'package'
+// "package"
protected class Package_0_0_0_0_Keyword_package extends KeywordToken {
public Package_0_0_0_0_Keyword_package(IInstanceDescription curr, AbstractToken pred) {
@@ -437,7 +437,7 @@ protected class Package_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// '{'
+// "{"
protected class Package_0_0_1_Keyword extends KeywordToken {
public Package_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -482,7 +482,7 @@ protected class Package_0_1_Assignment_namedElements extends AssignmentToken {
}
-// '}'
+// "}"
protected class Package_1_Keyword extends KeywordToken {
public Package_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -568,12 +568,12 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken {
/************ begin Rule DataType ****************
*
- * DataType : 'datatype' name = ID ;
+ * DataType : "datatype" name = ID ;
*
**/
-// 'datatype' name = ID
+// "datatype" name = ID
protected class DataType_Group extends GroupToken {
public DataType_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -601,7 +601,7 @@ protected class DataType_Group extends GroupToken {
}
}
-// 'datatype'
+// "datatype"
protected class DataType_0_Keyword_datatype extends KeywordToken {
public DataType_0_Keyword_datatype(IInstanceDescription curr, AbstractToken pred) {
@@ -642,12 +642,12 @@ protected class DataType_1_Assignment_name extends AssignmentToken {
/************ begin Rule Entity ****************
*
- * Entity : 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) * '}' ;
+ * Entity : "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) * "}" ;
*
**/
-// 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) * '}'
+// "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) * "}"
protected class Entity_Group extends GroupToken {
public Entity_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -675,7 +675,7 @@ protected class Entity_Group extends GroupToken {
}
}
-// 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) *
+// "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) *
protected class Entity_0_Group extends GroupToken {
public Entity_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -703,7 +703,7 @@ protected class Entity_0_Group extends GroupToken {
}
}
-// 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{'
+// "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{"
protected class Entity_0_0_Group extends GroupToken {
public Entity_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -731,7 +731,7 @@ protected class Entity_0_0_Group extends GroupToken {
}
}
-// 'entity' name = ID ( 'extends' superType = [ Entity ] ) ?
+// "entity" name = ID ( "extends" superType = [ Entity ] ) ?
protected class Entity_0_0_0_Group extends GroupToken {
public Entity_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -759,7 +759,7 @@ protected class Entity_0_0_0_Group extends GroupToken {
}
}
-// 'entity' name = ID
+// "entity" name = ID
protected class Entity_0_0_0_0_Group extends GroupToken {
public Entity_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -787,7 +787,7 @@ protected class Entity_0_0_0_0_Group extends GroupToken {
}
}
-// 'entity'
+// "entity"
protected class Entity_0_0_0_0_0_Keyword_entity extends KeywordToken {
public Entity_0_0_0_0_0_Keyword_entity(IInstanceDescription curr, AbstractToken pred) {
@@ -823,7 +823,7 @@ protected class Entity_0_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( 'extends' superType = [ Entity ] ) ?
+// ( "extends" superType = [ Entity ] ) ?
protected class Entity_0_0_0_1_Group extends GroupToken {
public Entity_0_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -851,7 +851,7 @@ protected class Entity_0_0_0_1_Group extends GroupToken {
}
}
-// 'extends'
+// "extends"
protected class Entity_0_0_0_1_0_Keyword_extends extends KeywordToken {
public Entity_0_0_0_1_0_Keyword_extends(IInstanceDescription curr, AbstractToken pred) {
@@ -891,7 +891,7 @@ protected class Entity_0_0_0_1_1_Assignment_superType extends AssignmentToken {
-// '{'
+// "{"
protected class Entity_0_0_1_Keyword extends KeywordToken {
public Entity_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -936,7 +936,7 @@ protected class Entity_0_1_Assignment_features extends AssignmentToken {
}
-// '}'
+// "}"
protected class Entity_1_Keyword extends KeywordToken {
public Entity_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1090,12 +1090,12 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
/************ begin Rule Attribute ****************
*
- * Attribute : 'attr' name = ID ':' type = TypeRef ;
+ * Attribute : "attr" name = ID ":" type = TypeRef ;
*
**/
-// 'attr' name = ID ':' type = TypeRef
+// "attr" name = ID ":" type = TypeRef
protected class Attribute_Group extends GroupToken {
public Attribute_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1123,7 +1123,7 @@ protected class Attribute_Group extends GroupToken {
}
}
-// 'attr' name = ID ':'
+// "attr" name = ID ":"
protected class Attribute_0_Group extends GroupToken {
public Attribute_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1151,7 +1151,7 @@ protected class Attribute_0_Group extends GroupToken {
}
}
-// 'attr' name = ID
+// "attr" name = ID
protected class Attribute_0_0_Group extends GroupToken {
public Attribute_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1179,7 +1179,7 @@ protected class Attribute_0_0_Group extends GroupToken {
}
}
-// 'attr'
+// "attr"
protected class Attribute_0_0_0_Keyword_attr extends KeywordToken {
public Attribute_0_0_0_Keyword_attr(IInstanceDescription curr, AbstractToken pred) {
@@ -1215,7 +1215,7 @@ protected class Attribute_0_0_1_Assignment_name extends AssignmentToken {
}
-// ':'
+// ":"
protected class Attribute_0_1_Keyword extends KeywordToken {
public Attribute_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1265,12 +1265,12 @@ protected class Attribute_1_Assignment_type extends AssignmentToken {
/************ begin Rule Reference ****************
*
- * Reference : 'ref' name = ID ':' type = TypeRef ( 'opposite' opposite = [ Reference ] ) ? ;
+ * Reference : "ref" name = ID ":" type = TypeRef ( "opposite" opposite = [ Reference ] ) ? ;
*
**/
-// 'ref' name = ID ':' type = TypeRef ( 'opposite' opposite = [ Reference ] ) ?
+// "ref" name = ID ":" type = TypeRef ( "opposite" opposite = [ Reference ] ) ?
protected class Reference_Group extends GroupToken {
public Reference_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1298,7 +1298,7 @@ protected class Reference_Group extends GroupToken {
}
}
-// 'ref' name = ID ':' type = TypeRef
+// "ref" name = ID ":" type = TypeRef
protected class Reference_0_Group extends GroupToken {
public Reference_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1326,7 +1326,7 @@ protected class Reference_0_Group extends GroupToken {
}
}
-// 'ref' name = ID ':'
+// "ref" name = ID ":"
protected class Reference_0_0_Group extends GroupToken {
public Reference_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1354,7 +1354,7 @@ protected class Reference_0_0_Group extends GroupToken {
}
}
-// 'ref' name = ID
+// "ref" name = ID
protected class Reference_0_0_0_Group extends GroupToken {
public Reference_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1382,7 +1382,7 @@ protected class Reference_0_0_0_Group extends GroupToken {
}
}
-// 'ref'
+// "ref"
protected class Reference_0_0_0_0_Keyword_ref extends KeywordToken {
public Reference_0_0_0_0_Keyword_ref(IInstanceDescription curr, AbstractToken pred) {
@@ -1418,7 +1418,7 @@ protected class Reference_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ':'
+// ":"
protected class Reference_0_0_1_Keyword extends KeywordToken {
public Reference_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1463,7 +1463,7 @@ protected class Reference_0_1_Assignment_type extends AssignmentToken {
}
-// ( 'opposite' opposite = [ Reference ] ) ?
+// ( "opposite" opposite = [ Reference ] ) ?
protected class Reference_1_Group extends GroupToken {
public Reference_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1491,7 +1491,7 @@ protected class Reference_1_Group extends GroupToken {
}
}
-// 'opposite'
+// "opposite"
protected class Reference_1_0_Keyword_opposite extends KeywordToken {
public Reference_1_0_Keyword_opposite(IInstanceDescription curr, AbstractToken pred) {
@@ -1536,12 +1536,12 @@ protected class Reference_1_1_Assignment_opposite extends AssignmentToken {
/************ begin Rule Operation ****************
*
- * Operation : 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':' type = TypeRef ;
+ * Operation : "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":" type = TypeRef ;
*
**/
-// 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':' type = TypeRef
+// "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":" type = TypeRef
protected class Operation_Group extends GroupToken {
public Operation_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1569,7 +1569,7 @@ protected class Operation_Group extends GroupToken {
}
}
-// 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':'
+// "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":"
protected class Operation_0_Group extends GroupToken {
public Operation_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1597,7 +1597,7 @@ protected class Operation_0_Group extends GroupToken {
}
}
-// 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')'
+// "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")"
protected class Operation_0_0_Group extends GroupToken {
public Operation_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1625,7 +1625,7 @@ protected class Operation_0_0_Group extends GroupToken {
}
}
-// 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ?
+// "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ?
protected class Operation_0_0_0_Group extends GroupToken {
public Operation_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1653,7 +1653,7 @@ protected class Operation_0_0_0_Group extends GroupToken {
}
}
-// 'op' name = ID '('
+// "op" name = ID "("
protected class Operation_0_0_0_0_Group extends GroupToken {
public Operation_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1681,7 +1681,7 @@ protected class Operation_0_0_0_0_Group extends GroupToken {
}
}
-// 'op' name = ID
+// "op" name = ID
protected class Operation_0_0_0_0_0_Group extends GroupToken {
public Operation_0_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1709,7 +1709,7 @@ protected class Operation_0_0_0_0_0_Group extends GroupToken {
}
}
-// 'op'
+// "op"
protected class Operation_0_0_0_0_0_0_Keyword_op extends KeywordToken {
public Operation_0_0_0_0_0_0_Keyword_op(IInstanceDescription curr, AbstractToken pred) {
@@ -1745,7 +1745,7 @@ protected class Operation_0_0_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// '('
+// "("
protected class Operation_0_0_0_0_1_Keyword extends KeywordToken {
public Operation_0_0_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1758,7 +1758,7 @@ protected class Operation_0_0_0_0_1_Keyword extends KeywordToken {
}
-// ( params += Parameter ( ',' params += Parameter ) * ) ?
+// ( params += Parameter ( "," params += Parameter ) * ) ?
protected class Operation_0_0_0_1_Group extends GroupToken {
public Operation_0_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1817,7 +1817,7 @@ protected class Operation_0_0_0_1_0_Assignment_params extends AssignmentToken {
}
}
-// ( ',' params += Parameter ) *
+// ( "," params += Parameter ) *
protected class Operation_0_0_0_1_1_Group extends GroupToken {
public Operation_0_0_0_1_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1845,7 +1845,7 @@ protected class Operation_0_0_0_1_1_Group extends GroupToken {
}
}
-// ','
+// ","
protected class Operation_0_0_0_1_1_0_Keyword extends KeywordToken {
public Operation_0_0_0_1_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1891,7 +1891,7 @@ protected class Operation_0_0_0_1_1_1_Assignment_params extends AssignmentToken
-// ')'
+// ")"
protected class Operation_0_0_1_Keyword extends KeywordToken {
public Operation_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1904,7 +1904,7 @@ protected class Operation_0_0_1_Keyword extends KeywordToken {
}
-// ':'
+// ":"
protected class Operation_0_1_Keyword extends KeywordToken {
public Operation_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
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 316f7a2..9f5c93a 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
@@ -44,13 +44,13 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Assignment c1AssignmentImportURI = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0);
- // Import : 'import' importURI = STRING ;
+ // Import : "import" importURI = STRING ;
public ParserRule getRule() { return rule; }
- // 'import' importURI = STRING
+ // "import" importURI = STRING
public Group eleGroup() { return cGroup; }
- // 'import'
+ // "import"
public Keyword ele0KeywordImport() { return c0KeywordImport; }
// importURI = STRING
@@ -93,22 +93,22 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final RuleCall c010ParserRuleCallNamedElement = (RuleCall)c01AssignmentNamedElements.eContents().get(0);
private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
- // Package : 'package' name = QualifiedName '{' ( namedElements += NamedElement ) * '}' ;
+ // Package : "package" name = QualifiedName "{" ( namedElements += NamedElement ) * "}" ;
public ParserRule getRule() { return rule; }
- // 'package' name = QualifiedName '{' ( namedElements += NamedElement ) * '}'
+ // "package" name = QualifiedName "{" ( namedElements += NamedElement ) * "}"
public Group eleGroup() { return cGroup; }
- // 'package' name = QualifiedName '{' ( namedElements += NamedElement ) *
+ // "package" name = QualifiedName "{" ( namedElements += NamedElement ) *
public Group ele0Group() { return c0Group; }
- // 'package' name = QualifiedName '{'
+ // "package" name = QualifiedName "{"
public Group ele00Group() { return c00Group; }
- // 'package' name = QualifiedName
+ // "package" name = QualifiedName
public Group ele000Group() { return c000Group; }
- // 'package'
+ // "package"
public Keyword ele0000KeywordPackage() { return c0000KeywordPackage; }
// name = QualifiedName
@@ -117,7 +117,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// QualifiedName
public RuleCall ele00010ParserRuleCallQualifiedName() { return c00010ParserRuleCallQualifiedName; }
- // '{'
+ // "{"
public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
// ( namedElements += NamedElement ) *
@@ -126,7 +126,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// NamedElement
public RuleCall ele010ParserRuleCallNamedElement() { return c010ParserRuleCallNamedElement; }
- // '}'
+ // "}"
public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
}
@@ -156,13 +156,13 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
- // DataType : 'datatype' name = ID ;
+ // DataType : "datatype" name = ID ;
public ParserRule getRule() { return rule; }
- // 'datatype' name = ID
+ // "datatype" name = ID
public Group eleGroup() { return cGroup; }
- // 'datatype'
+ // "datatype"
public Keyword ele0KeywordDatatype() { return c0KeywordDatatype; }
// name = ID
@@ -191,25 +191,25 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final RuleCall c010ParserRuleCallFeature = (RuleCall)c01AssignmentFeatures.eContents().get(0);
private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
- // Entity : 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) * '}' ;
+ // Entity : "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) * "}" ;
public ParserRule getRule() { return rule; }
- // 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) * '}'
+ // "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) * "}"
public Group eleGroup() { return cGroup; }
- // 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) *
+ // "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) *
public Group ele0Group() { return c0Group; }
- // 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{'
+ // "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{"
public Group ele00Group() { return c00Group; }
- // 'entity' name = ID ( 'extends' superType = [ Entity ] ) ?
+ // "entity" name = ID ( "extends" superType = [ Entity ] ) ?
public Group ele000Group() { return c000Group; }
- // 'entity' name = ID
+ // "entity" name = ID
public Group ele0000Group() { return c0000Group; }
- // 'entity'
+ // "entity"
public Keyword ele00000KeywordEntity() { return c00000KeywordEntity; }
// name = ID
@@ -218,10 +218,10 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// ID
public RuleCall ele000010LexerRuleCallID() { return c000010LexerRuleCallID; }
- // ( 'extends' superType = [ Entity ] ) ?
+ // ( "extends" superType = [ Entity ] ) ?
public Group ele0001Group() { return c0001Group; }
- // 'extends'
+ // "extends"
public Keyword ele00010KeywordExtends() { return c00010KeywordExtends; }
// superType = [ Entity ]
@@ -230,7 +230,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// [ Entity ]
public CrossReference ele000110CrossReferenceEStringEntity() { return c000110CrossReferenceEStringEntity; }
- // '{'
+ // "{"
public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
// ( features += Feature ) *
@@ -239,7 +239,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// Feature
public RuleCall ele010ParserRuleCallFeature() { return c010ParserRuleCallFeature; }
- // '}'
+ // "}"
public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
}
@@ -293,19 +293,19 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0);
- // Attribute : 'attr' name = ID ':' type = TypeRef ;
+ // Attribute : "attr" name = ID ":" type = TypeRef ;
public ParserRule getRule() { return rule; }
- // 'attr' name = ID ':' type = TypeRef
+ // "attr" name = ID ":" type = TypeRef
public Group eleGroup() { return cGroup; }
- // 'attr' name = ID ':'
+ // "attr" name = ID ":"
public Group ele0Group() { return c0Group; }
- // 'attr' name = ID
+ // "attr" name = ID
public Group ele00Group() { return c00Group; }
- // 'attr'
+ // "attr"
public Keyword ele000KeywordAttr() { return c000KeywordAttr; }
// name = ID
@@ -314,7 +314,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// ID
public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
- // ':'
+ // ":"
public Keyword ele01KeywordColon() { return c01KeywordColon; }
// type = TypeRef
@@ -341,22 +341,22 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Assignment c11AssignmentOpposite = (Assignment)c1Group.eContents().get(1);
private final CrossReference c110CrossReferenceEStringReference = (CrossReference)c11AssignmentOpposite.eContents().get(0);
- // Reference : 'ref' name = ID ':' type = TypeRef ( 'opposite' opposite = [ Reference ] ) ? ;
+ // Reference : "ref" name = ID ":" type = TypeRef ( "opposite" opposite = [ Reference ] ) ? ;
public ParserRule getRule() { return rule; }
- // 'ref' name = ID ':' type = TypeRef ( 'opposite' opposite = [ Reference ] ) ?
+ // "ref" name = ID ":" type = TypeRef ( "opposite" opposite = [ Reference ] ) ?
public Group eleGroup() { return cGroup; }
- // 'ref' name = ID ':' type = TypeRef
+ // "ref" name = ID ":" type = TypeRef
public Group ele0Group() { return c0Group; }
- // 'ref' name = ID ':'
+ // "ref" name = ID ":"
public Group ele00Group() { return c00Group; }
- // 'ref' name = ID
+ // "ref" name = ID
public Group ele000Group() { return c000Group; }
- // 'ref'
+ // "ref"
public Keyword ele0000KeywordRef() { return c0000KeywordRef; }
// name = ID
@@ -365,7 +365,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// ID
public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
- // ':'
+ // ":"
public Keyword ele001KeywordColon() { return c001KeywordColon; }
// type = TypeRef
@@ -374,10 +374,10 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// TypeRef
public RuleCall ele010ParserRuleCallTypeRef() { return c010ParserRuleCallTypeRef; }
- // ( 'opposite' opposite = [ Reference ] ) ?
+ // ( "opposite" opposite = [ Reference ] ) ?
public Group ele1Group() { return c1Group; }
- // 'opposite'
+ // "opposite"
public Keyword ele10KeywordOpposite() { return c10KeywordOpposite; }
// opposite = [ Reference ]
@@ -411,28 +411,28 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0);
- // Operation : 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':' type = TypeRef ;
+ // Operation : "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":" type = TypeRef ;
public ParserRule getRule() { return rule; }
- // 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':' type = TypeRef
+ // "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":" type = TypeRef
public Group eleGroup() { return cGroup; }
- // 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':'
+ // "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":"
public Group ele0Group() { return c0Group; }
- // 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')'
+ // "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")"
public Group ele00Group() { return c00Group; }
- // 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ?
+ // "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ?
public Group ele000Group() { return c000Group; }
- // 'op' name = ID '('
+ // "op" name = ID "("
public Group ele0000Group() { return c0000Group; }
- // 'op' name = ID
+ // "op" name = ID
public Group ele00000Group() { return c00000Group; }
- // 'op'
+ // "op"
public Keyword ele000000KeywordOp() { return c000000KeywordOp; }
// name = ID
@@ -441,10 +441,10 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// ID
public RuleCall ele0000010LexerRuleCallID() { return c0000010LexerRuleCallID; }
- // '('
+ // "("
public Keyword ele00001KeywordLeftParenthesis() { return c00001KeywordLeftParenthesis; }
- // ( params += Parameter ( ',' params += Parameter ) * ) ?
+ // ( params += Parameter ( "," params += Parameter ) * ) ?
public Group ele0001Group() { return c0001Group; }
// params += Parameter
@@ -453,10 +453,10 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// Parameter
public RuleCall ele000100ParserRuleCallParameter() { return c000100ParserRuleCallParameter; }
- // ( ',' params += Parameter ) *
+ // ( "," params += Parameter ) *
public Group ele00011Group() { return c00011Group; }
- // ','
+ // ","
public Keyword ele000110KeywordComma() { return c000110KeywordComma; }
// params += Parameter
@@ -465,10 +465,10 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
// Parameter
public RuleCall ele0001110ParserRuleCallParameter() { return c0001110ParserRuleCallParameter; }
- // ')'
+ // ")"
public Keyword ele001KeywordRightParenthesis() { return c001KeywordRightParenthesis; }
- // ':'
+ // ":"
public Keyword ele01KeywordColon() { return c01KeywordColon; }
// type = TypeRef
@@ -547,19 +547,19 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
private final Keyword c10KeywordFullStop = (Keyword)c1Group.eContents().get(0);
private final RuleCall c11LexerRuleCallID = (RuleCall)c1Group.eContents().get(1);
- // QualifiedName returns EString : ID ( '.' ID ) * ;
+ // QualifiedName returns EString : ID ( "." ID ) * ;
public ParserRule getRule() { return rule; }
- // ID ( '.' ID ) *
+ // ID ( "." ID ) *
public Group eleGroup() { return cGroup; }
// ID
public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
- // ( '.' ID ) *
+ // ( "." ID ) *
public Group ele1Group() { return c1Group; }
- // '.'
+ // "."
public Keyword ele10KeywordFullStop() { return c10KeywordFullStop; }
// ID
@@ -607,7 +607,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
return (pFile != null) ? pFile : (pFile = new FileElements());
}
- // Import : 'import' importURI = STRING ;
+ // Import : "import" importURI = STRING ;
public ImportElements prImport() {
return (pImport != null) ? pImport : (pImport = new ImportElements());
}
@@ -617,7 +617,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
return (pNamedElement != null) ? pNamedElement : (pNamedElement = new NamedElementElements());
}
- // Package : 'package' name = QualifiedName '{' ( namedElements += NamedElement ) * '}' ;
+ // Package : "package" name = QualifiedName "{" ( namedElements += NamedElement ) * "}" ;
public PackageElements prPackage() {
return (pPackage != null) ? pPackage : (pPackage = new PackageElements());
}
@@ -627,12 +627,12 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
return (pType != null) ? pType : (pType = new TypeElements());
}
- // DataType : 'datatype' name = ID ;
+ // DataType : "datatype" name = ID ;
public DataTypeElements prDataType() {
return (pDataType != null) ? pDataType : (pDataType = new DataTypeElements());
}
- // Entity : 'entity' name = ID ( 'extends' superType = [ Entity ] ) ? '{' ( features += Feature ) * '}' ;
+ // Entity : "entity" name = ID ( "extends" superType = [ Entity ] ) ? "{" ( features += Feature ) * "}" ;
public EntityElements prEntity() {
return (pEntity != null) ? pEntity : (pEntity = new EntityElements());
}
@@ -647,17 +647,17 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
return (pStructuralFeature != null) ? pStructuralFeature : (pStructuralFeature = new StructuralFeatureElements());
}
- // Attribute : 'attr' name = ID ':' type = TypeRef ;
+ // Attribute : "attr" name = ID ":" type = TypeRef ;
public AttributeElements prAttribute() {
return (pAttribute != null) ? pAttribute : (pAttribute = new AttributeElements());
}
- // Reference : 'ref' name = ID ':' type = TypeRef ( 'opposite' opposite = [ Reference ] ) ? ;
+ // Reference : "ref" name = ID ":" type = TypeRef ( "opposite" opposite = [ Reference ] ) ? ;
public ReferenceElements prReference() {
return (pReference != null) ? pReference : (pReference = new ReferenceElements());
}
- // Operation : 'op' name = ID '(' ( params += Parameter ( ',' params += Parameter ) * ) ? ')' ':' type = TypeRef ;
+ // Operation : "op" name = ID "(" ( params += Parameter ( "," params += Parameter ) * ) ? ")" ":" type = TypeRef ;
public OperationElements prOperation() {
return (pOperation != null) ? pOperation : (pOperation = new OperationElements());
}
@@ -677,7 +677,7 @@ public class DomainmodelGrammarAccess extends BaseEPackageAccess implements IGra
return (pTypeRef != null) ? pTypeRef : (pTypeRef = new TypeRefElements());
}
- // QualifiedName returns EString : ID ( '.' ID ) * ;
+ // QualifiedName returns EString : ID ( "." ID ) * ;
public QualifiedNameElements prQualifiedName() {
return (pQualifiedName != null) ? pQualifiedName : (pQualifiedName = new QualifiedNameElements());
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/GenerateGrammar.java b/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/GenerateGrammar.java
index 0fdfeb4..e2bd552 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/GenerateGrammar.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src/xtext/example/GenerateGrammar.java
@@ -18,14 +18,24 @@ import org.eclipse.xtext.resource.XtextResourceSet;
public class GenerateGrammar {
private Logger log = Logger.getLogger( GenerateGrammar.class);
- private static final String PATH = ".";
+ private static final String RUNTIME_PATH = ".";
private static final String UI_PATH = "../org.eclipse.xtext.example.domainmodel.ui";
+ private String uiPath = UI_PATH;
+
+ private String runtimePath = RUNTIME_PATH;
+
+ private GenerateGrammar(String... args) {
+ if (args.length > 0) {
+ runtimePath = args[0];
+ uiPath = args[0] + "/" + UI_PATH;
+ }
+ }
public void generate() throws IOException {
XtextStandaloneSetup.doSetup();
- GeneratorFacade.cleanFolder(PATH + "/src-gen");
- GeneratorFacade.cleanFolder(UI_PATH + "/src-gen");
+ GeneratorFacade.cleanFolder(runtimePath + "/src-gen");
+ GeneratorFacade.cleanFolder(uiPath + "/src-gen");
String classpathUri = "classpath:/xtext/example/Domainmodel.xtext";
log.info("loading " + classpathUri);
@@ -36,13 +46,13 @@ public class GenerateGrammar {
resource.load(null);
Grammar grammarModel = (Grammar) resource.getContents().get(0);
- GeneratorFacade.generate(grammarModel, PATH, UI_PATH, "dmodel");
+ GeneratorFacade.generate(grammarModel, runtimePath, uiPath, "dmodel");
log.info("Done.");
}
- public static void main(String[] args) throws IOException {
- GenerateGrammar generator = new GenerateGrammar();
- generator.generate();
+ public static void main(String... args) throws IOException {
+ GenerateGrammar generator = new GenerateGrammar(args);
+ generator.generate();
}
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
index cdd37b0..727326c 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java
@@ -45,12 +45,15 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
index 9f9e010..0ce95fa 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java
@@ -48,16 +48,20 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
index 0ee45c9..7c24dfe 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java
@@ -62,24 +62,30 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$17()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$19()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -102,20 +108,25 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$13()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$16()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
index e147e07..e8a64cd 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java
@@ -55,32 +55,40 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$14()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$15()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
index c1ab4f5..dc765c3 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java
@@ -48,16 +48,20 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
index 866a33b..f4092c6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
@@ -29,12 +29,12 @@ public class FowlerDslParseTreeConstructor extends AbstractParseTreeConstructor
/************ begin Rule Statemachine ****************
*
- * Statemachine : 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) * ;
+ * Statemachine : "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end" ( states += State ) * ;
*
**/
-// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) *
+// "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end" ( states += State ) *
protected class Statemachine_Group extends GroupToken {
public Statemachine_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -62,7 +62,7 @@ protected class Statemachine_Group extends GroupToken {
}
}
-// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end'
+// "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end"
protected class Statemachine_0_Group extends GroupToken {
public Statemachine_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -90,7 +90,7 @@ protected class Statemachine_0_Group extends GroupToken {
}
}
-// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) *
+// "events" ( events += Event ) * "end" "commands" ( commands += Command ) *
protected class Statemachine_0_0_Group extends GroupToken {
public Statemachine_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -118,7 +118,7 @@ protected class Statemachine_0_0_Group extends GroupToken {
}
}
-// 'events' ( events += Event ) * 'end' 'commands'
+// "events" ( events += Event ) * "end" "commands"
protected class Statemachine_0_0_0_Group extends GroupToken {
public Statemachine_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -146,7 +146,7 @@ protected class Statemachine_0_0_0_Group extends GroupToken {
}
}
-// 'events' ( events += Event ) * 'end'
+// "events" ( events += Event ) * "end"
protected class Statemachine_0_0_0_0_Group extends GroupToken {
public Statemachine_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -174,7 +174,7 @@ protected class Statemachine_0_0_0_0_Group extends GroupToken {
}
}
-// 'events' ( events += Event ) *
+// "events" ( events += Event ) *
protected class Statemachine_0_0_0_0_0_Group extends GroupToken {
public Statemachine_0_0_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -202,7 +202,7 @@ protected class Statemachine_0_0_0_0_0_Group extends GroupToken {
}
}
-// 'events'
+// "events"
protected class Statemachine_0_0_0_0_0_0_Keyword_events extends KeywordToken {
public Statemachine_0_0_0_0_0_0_Keyword_events(IInstanceDescription curr, AbstractToken pred) {
@@ -246,7 +246,7 @@ protected class Statemachine_0_0_0_0_0_1_Assignment_events extends AssignmentTok
}
-// 'end'
+// "end"
protected class Statemachine_0_0_0_0_1_Keyword_end extends KeywordToken {
public Statemachine_0_0_0_0_1_Keyword_end(IInstanceDescription curr, AbstractToken pred) {
@@ -259,7 +259,7 @@ protected class Statemachine_0_0_0_0_1_Keyword_end extends KeywordToken {
}
-// 'commands'
+// "commands"
protected class Statemachine_0_0_0_1_Keyword_commands extends KeywordToken {
public Statemachine_0_0_0_1_Keyword_commands(IInstanceDescription curr, AbstractToken pred) {
@@ -304,7 +304,7 @@ protected class Statemachine_0_0_1_Assignment_commands extends AssignmentToken
}
-// 'end'
+// "end"
protected class Statemachine_0_1_Keyword_end extends KeywordToken {
public Statemachine_0_1_Keyword_end(IInstanceDescription curr, AbstractToken pred) {
@@ -354,12 +354,12 @@ protected class Statemachine_1_Assignment_states extends AssignmentToken {
/************ begin Rule Event ****************
*
- * Event : ( resetting ?= 'resetting' ) ? name = ID code = ID ;
+ * Event : ( resetting ?= "resetting" ) ? name = ID code = ID ;
*
**/
-// ( resetting ?= 'resetting' ) ? name = ID code = ID
+// ( resetting ?= "resetting" ) ? name = ID code = ID
protected class Event_Group extends GroupToken {
public Event_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -387,7 +387,7 @@ protected class Event_Group extends GroupToken {
}
}
-// ( resetting ?= 'resetting' ) ? name = ID
+// ( resetting ?= "resetting" ) ? name = ID
protected class Event_0_Group extends GroupToken {
public Event_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -415,7 +415,7 @@ protected class Event_0_Group extends GroupToken {
}
}
-// ( resetting ?= 'resetting' ) ?
+// ( resetting ?= "resetting" ) ?
protected class Event_0_0_Assignment_resetting extends AssignmentToken {
public Event_0_0_Assignment_resetting(IInstanceDescription curr, AbstractToken pred) {
@@ -578,12 +578,12 @@ protected class Command_1_Assignment_code extends AssignmentToken {
/************ begin Rule State ****************
*
- * State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
+ * State : "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) * "end" ;
*
**/
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
+// "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) * "end"
protected class State_Group extends GroupToken {
public State_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -611,7 +611,7 @@ protected class State_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
+// "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) *
protected class State_0_Group extends GroupToken {
public State_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -639,7 +639,7 @@ protected class State_0_Group extends GroupToken {
}
}
-// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ?
protected class State_0_0_Group extends GroupToken {
public State_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -667,7 +667,7 @@ protected class State_0_0_Group extends GroupToken {
}
}
-// 'state' name = ID
+// "state" name = ID
protected class State_0_0_0_Group extends GroupToken {
public State_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -695,7 +695,7 @@ protected class State_0_0_0_Group extends GroupToken {
}
}
-// 'state'
+// "state"
protected class State_0_0_0_0_Keyword_state extends KeywordToken {
public State_0_0_0_0_Keyword_state(IInstanceDescription curr, AbstractToken pred) {
@@ -731,7 +731,7 @@ protected class State_0_0_0_1_Assignment_name extends AssignmentToken {
}
-// ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+// ( "actions" "{" ( actions += [ Command ] ) + "}" ) ?
protected class State_0_0_1_Group extends GroupToken {
public State_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -759,7 +759,7 @@ protected class State_0_0_1_Group extends GroupToken {
}
}
-// 'actions' '{' ( actions += [ Command ] ) +
+// "actions" "{" ( actions += [ Command ] ) +
protected class State_0_0_1_0_Group extends GroupToken {
public State_0_0_1_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -787,7 +787,7 @@ protected class State_0_0_1_0_Group extends GroupToken {
}
}
-// 'actions' '{'
+// "actions" "{"
protected class State_0_0_1_0_0_Group extends GroupToken {
public State_0_0_1_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -815,7 +815,7 @@ protected class State_0_0_1_0_0_Group extends GroupToken {
}
}
-// 'actions'
+// "actions"
protected class State_0_0_1_0_0_0_Keyword_actions extends KeywordToken {
public State_0_0_1_0_0_0_Keyword_actions(IInstanceDescription curr, AbstractToken pred) {
@@ -827,7 +827,7 @@ protected class State_0_0_1_0_0_0_Keyword_actions extends KeywordToken {
}
}
-// '{'
+// "{"
protected class State_0_0_1_0_0_1_Keyword extends KeywordToken {
public State_0_0_1_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -867,7 +867,7 @@ protected class State_0_0_1_0_1_Assignment_actions extends AssignmentToken {
}
-// '}'
+// "}"
protected class State_0_0_1_1_Keyword extends KeywordToken {
public State_0_0_1_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -913,7 +913,7 @@ protected class State_0_1_Assignment_transitions extends AssignmentToken {
}
-// 'end'
+// "end"
protected class State_1_Keyword_end extends KeywordToken {
public State_1_Keyword_end(IInstanceDescription curr, AbstractToken pred) {
@@ -931,12 +931,12 @@ protected class State_1_Keyword_end extends KeywordToken {
/************ begin Rule Transition ****************
*
- * Transition : event = [ Event ] '=>' state = [ State ] ;
+ * Transition : event = [ Event ] "=>" state = [ State ] ;
*
**/
-// event = [ Event ] '=>' state = [ State ]
+// event = [ Event ] "=>" state = [ State ]
protected class Transition_Group extends GroupToken {
public Transition_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -964,7 +964,7 @@ protected class Transition_Group extends GroupToken {
}
}
-// event = [ Event ] '=>'
+// event = [ Event ] "=>"
protected class Transition_0_Group extends GroupToken {
public Transition_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1018,7 +1018,7 @@ protected class Transition_0_0_Assignment_event extends AssignmentToken {
}
}
-// '=>'
+// "=>"
protected class Transition_0_1_Keyword extends KeywordToken {
public Transition_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
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 493e8f0..fe6f3c3 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
@@ -29,28 +29,28 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
private final Assignment c1AssignmentStates = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallState = (RuleCall)c1AssignmentStates.eContents().get(0);
- // Statemachine : 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) * ;
+ // Statemachine : "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end" ( states += State ) * ;
public ParserRule getRule() { return rule; }
- // 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) *
+ // "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end" ( states += State ) *
public Group eleGroup() { return cGroup; }
- // 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end'
+ // "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end"
public Group ele0Group() { return c0Group; }
- // 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) *
+ // "events" ( events += Event ) * "end" "commands" ( commands += Command ) *
public Group ele00Group() { return c00Group; }
- // 'events' ( events += Event ) * 'end' 'commands'
+ // "events" ( events += Event ) * "end" "commands"
public Group ele000Group() { return c000Group; }
- // 'events' ( events += Event ) * 'end'
+ // "events" ( events += Event ) * "end"
public Group ele0000Group() { return c0000Group; }
- // 'events' ( events += Event ) *
+ // "events" ( events += Event ) *
public Group ele00000Group() { return c00000Group; }
- // 'events'
+ // "events"
public Keyword ele000000KeywordEvents() { return c000000KeywordEvents; }
// ( events += Event ) *
@@ -59,10 +59,10 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// Event
public RuleCall ele0000010ParserRuleCallEvent() { return c0000010ParserRuleCallEvent; }
- // 'end'
+ // "end"
public Keyword ele00001KeywordEnd() { return c00001KeywordEnd; }
- // 'commands'
+ // "commands"
public Keyword ele0001KeywordCommands() { return c0001KeywordCommands; }
// ( commands += Command ) *
@@ -71,7 +71,7 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// Command
public RuleCall ele0010ParserRuleCallCommand() { return c0010ParserRuleCallCommand; }
- // 'end'
+ // "end"
public Keyword ele01KeywordEnd() { return c01KeywordEnd; }
// ( states += State ) *
@@ -92,19 +92,19 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
private final Assignment c1AssignmentCode = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentCode.eContents().get(0);
- // Event : ( resetting ?= 'resetting' ) ? name = ID code = ID ;
+ // Event : ( resetting ?= "resetting" ) ? name = ID code = ID ;
public ParserRule getRule() { return rule; }
- // ( resetting ?= 'resetting' ) ? name = ID code = ID
+ // ( resetting ?= "resetting" ) ? name = ID code = ID
public Group eleGroup() { return cGroup; }
- // ( resetting ?= 'resetting' ) ? name = ID
+ // ( resetting ?= "resetting" ) ? name = ID
public Group ele0Group() { return c0Group; }
- // ( resetting ?= 'resetting' ) ?
+ // ( resetting ?= "resetting" ) ?
public Assignment ele00AssignmentResetting() { return c00AssignmentResetting; }
- // 'resetting'
+ // "resetting"
public Keyword ele000KeywordResetting() { return c000KeywordResetting; }
// name = ID
@@ -168,22 +168,22 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
private final RuleCall c010ParserRuleCallTransition = (RuleCall)c01AssignmentTransitions.eContents().get(0);
private final Keyword c1KeywordEnd = (Keyword)cGroup.eContents().get(1);
- // State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
+ // State : "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) * "end" ;
public ParserRule getRule() { return rule; }
- // 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
+ // "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) * "end"
public Group eleGroup() { return cGroup; }
- // 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
+ // "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) *
public Group ele0Group() { return c0Group; }
- // 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+ // "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ?
public Group ele00Group() { return c00Group; }
- // 'state' name = ID
+ // "state" name = ID
public Group ele000Group() { return c000Group; }
- // 'state'
+ // "state"
public Keyword ele0000KeywordState() { return c0000KeywordState; }
// name = ID
@@ -192,19 +192,19 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// ID
public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
- // ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
+ // ( "actions" "{" ( actions += [ Command ] ) + "}" ) ?
public Group ele001Group() { return c001Group; }
- // 'actions' '{' ( actions += [ Command ] ) +
+ // "actions" "{" ( actions += [ Command ] ) +
public Group ele0010Group() { return c0010Group; }
- // 'actions' '{'
+ // "actions" "{"
public Group ele00100Group() { return c00100Group; }
- // 'actions'
+ // "actions"
public Keyword ele001000KeywordActions() { return c001000KeywordActions; }
- // '{'
+ // "{"
public Keyword ele001001KeywordLeftCurlyBracket() { return c001001KeywordLeftCurlyBracket; }
// ( actions += [ Command ] ) +
@@ -213,7 +213,7 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// [ Command ]
public CrossReference ele001010CrossReferenceEStringCommand() { return c001010CrossReferenceEStringCommand; }
- // '}'
+ // "}"
public Keyword ele0011KeywordRightCurlyBracket() { return c0011KeywordRightCurlyBracket; }
// ( transitions += Transition ) *
@@ -222,7 +222,7 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// Transition
public RuleCall ele010ParserRuleCallTransition() { return c010ParserRuleCallTransition; }
- // 'end'
+ // "end"
public Keyword ele1KeywordEnd() { return c1KeywordEnd; }
}
@@ -236,13 +236,13 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
private final Assignment c1AssignmentState = (Assignment)cGroup.eContents().get(1);
private final CrossReference c10CrossReferenceEStringState = (CrossReference)c1AssignmentState.eContents().get(0);
- // Transition : event = [ Event ] '=>' state = [ State ] ;
+ // Transition : event = [ Event ] "=>" state = [ State ] ;
public ParserRule getRule() { return rule; }
- // event = [ Event ] '=>' state = [ State ]
+ // event = [ Event ] "=>" state = [ State ]
public Group eleGroup() { return cGroup; }
- // event = [ Event ] '=>'
+ // event = [ Event ] "=>"
public Group ele0Group() { return c0Group; }
// event = [ Event ]
@@ -251,7 +251,7 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
// [ Event ]
public CrossReference ele000CrossReferenceEStringEvent() { return c000CrossReferenceEStringEvent; }
- // '=>'
+ // "=>"
public Keyword ele01KeywordEqualsSignGreaterThanSign() { return c01KeywordEqualsSignGreaterThanSign; }
// state = [ State ]
@@ -286,12 +286,12 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
}
- // Statemachine : 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) * ;
+ // Statemachine : "events" ( events += Event ) * "end" "commands" ( commands += Command ) * "end" ( states += State ) * ;
public StatemachineElements prStatemachine() {
return (pStatemachine != null) ? pStatemachine : (pStatemachine = new StatemachineElements());
}
- // Event : ( resetting ?= 'resetting' ) ? name = ID code = ID ;
+ // Event : ( resetting ?= "resetting" ) ? name = ID code = ID ;
public EventElements prEvent() {
return (pEvent != null) ? pEvent : (pEvent = new EventElements());
}
@@ -301,12 +301,12 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm
return (pCommand != null) ? pCommand : (pCommand = new CommandElements());
}
- // State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
+ // State : "state" name = ID ( "actions" "{" ( actions += [ Command ] ) + "}" ) ? ( transitions += Transition ) * "end" ;
public StateElements prState() {
return (pState != null) ? pState : (pState = new StateElements());
}
- // Transition : event = [ Event ] '=>' state = [ State ] ;
+ // Transition : event = [ Event ] "=>" state = [ State ] ;
public TransitionElements prTransition() {
return (pTransition != null) ? pTransition : (pTransition = new TransitionElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 30c6432..6edbed4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -14,10 +14,10 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="rules" unique="false" upperBound="-1" eType="//AbstractRule" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
<eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
index e7c6754..3e54ab7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java
@@ -45,12 +45,15 @@ public final class ImportUriTestLanguageImportConsumer extends NonTerminalConsum
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
index 5fe60c9..6253353 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java
@@ -41,12 +41,15 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
index 8d17b96..1e691e5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java
@@ -51,20 +51,25 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
index 86d5c1c..65446bf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java
@@ -45,12 +45,15 @@ public final class LangATestLanguageImportConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
index 4e3a7f7..f7496f4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java
@@ -41,12 +41,15 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
index bab08ec..7ff53de 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java
@@ -51,20 +51,25 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer {
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
index 81b74c8..d977f70 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/ImportUriTestLanguageParseTreeConstructor.java
@@ -128,12 +128,12 @@ protected class Main_1_Assignment_types extends AssignmentToken {
/************ begin Rule Import ****************
*
- * Import : 'import' importURI = STRING ;
+ * Import : "import" importURI = STRING ;
*
**/
-// 'import' importURI = STRING
+// "import" importURI = STRING
protected class Import_Group extends GroupToken {
public Import_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -161,7 +161,7 @@ protected class Import_Group extends GroupToken {
}
}
-// 'import'
+// "import"
protected class Import_0_Keyword_import extends KeywordToken {
public Import_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
@@ -202,12 +202,12 @@ protected class Import_1_Assignment_importURI extends AssignmentToken {
/************ begin Rule Type ****************
*
- * Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ * Type : "type" name = ID "extends" ^extends = [ Type ] ;
*
**/
-// 'type' name = ID 'extends' ^extends = [ Type ]
+// "type" name = ID "extends" ^extends = [ Type ]
protected class Type_Group extends GroupToken {
public Type_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -235,7 +235,7 @@ protected class Type_Group extends GroupToken {
}
}
-// 'type' name = ID 'extends'
+// "type" name = ID "extends"
protected class Type_0_Group extends GroupToken {
public Type_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -263,7 +263,7 @@ protected class Type_0_Group extends GroupToken {
}
}
-// 'type' name = ID
+// "type" name = ID
protected class Type_0_0_Group extends GroupToken {
public Type_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -291,7 +291,7 @@ protected class Type_0_0_Group extends GroupToken {
}
}
-// 'type'
+// "type"
protected class Type_0_0_0_Keyword_type extends KeywordToken {
public Type_0_0_0_Keyword_type(IInstanceDescription curr, AbstractToken pred) {
@@ -327,7 +327,7 @@ protected class Type_0_0_1_Assignment_name extends AssignmentToken {
}
-// 'extends'
+// "extends"
protected class Type_0_1_Keyword_extends extends KeywordToken {
public Type_0_1_Keyword_extends(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangATestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangATestLanguageParseTreeConstructor.java
index eff1661..b90c077 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangATestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parsetree/reconstr/LangATestLanguageParseTreeConstructor.java
@@ -128,12 +128,12 @@ protected class Main_1_Assignment_types extends AssignmentToken {
/************ begin Rule Import ****************
*
- * Import : 'import' uri = STRING ;
+ * Import : "import" uri = STRING ;
*
**/
-// 'import' uri = STRING
+// "import" uri = STRING
protected class Import_Group extends GroupToken {
public Import_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -161,7 +161,7 @@ protected class Import_Group extends GroupToken {
}
}
-// 'import'
+// "import"
protected class Import_0_Keyword_import extends KeywordToken {
public Import_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
@@ -202,12 +202,12 @@ protected class Import_1_Assignment_uri extends AssignmentToken {
/************ begin Rule Type ****************
*
- * Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ * Type : "type" name = ID "extends" ^extends = [ Type ] ;
*
**/
-// 'type' name = ID 'extends' ^extends = [ Type ]
+// "type" name = ID "extends" ^extends = [ Type ]
protected class Type_Group extends GroupToken {
public Type_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -235,7 +235,7 @@ protected class Type_Group extends GroupToken {
}
}
-// 'type' name = ID 'extends'
+// "type" name = ID "extends"
protected class Type_0_Group extends GroupToken {
public Type_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -263,7 +263,7 @@ protected class Type_0_Group extends GroupToken {
}
}
-// 'type' name = ID
+// "type" name = ID
protected class Type_0_0_Group extends GroupToken {
public Type_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -291,7 +291,7 @@ protected class Type_0_0_Group extends GroupToken {
}
}
-// 'type'
+// "type"
protected class Type_0_0_0_Keyword_type extends KeywordToken {
public Type_0_0_0_Keyword_type(IInstanceDescription curr, AbstractToken pred) {
@@ -327,7 +327,7 @@ protected class Type_0_0_1_Assignment_name extends AssignmentToken {
}
-// 'extends'
+// "extends"
protected class Type_0_1_Keyword_extends extends KeywordToken {
public Type_0_1_Keyword_extends(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
index 454e717..5e5b2a9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
@@ -44,13 +44,13 @@ public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess imple
private final Assignment c1AssignmentImportURI = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0);
- // Import : 'import' importURI = STRING ;
+ // Import : "import" importURI = STRING ;
public ParserRule getRule() { return rule; }
- // 'import' importURI = STRING
+ // "import" importURI = STRING
public Group eleGroup() { return cGroup; }
- // 'import'
+ // "import"
public Keyword ele0KeywordImport() { return c0KeywordImport; }
// importURI = STRING
@@ -72,19 +72,19 @@ public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess imple
private final Assignment c1AssignmentExtends = (Assignment)cGroup.eContents().get(1);
private final CrossReference c10CrossReferenceEStringType = (CrossReference)c1AssignmentExtends.eContents().get(0);
- // Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ // Type : "type" name = ID "extends" ^extends = [ Type ] ;
public ParserRule getRule() { return rule; }
- // 'type' name = ID 'extends' ^extends = [ Type ]
+ // "type" name = ID "extends" ^extends = [ Type ]
public Group eleGroup() { return cGroup; }
- // 'type' name = ID 'extends'
+ // "type" name = ID "extends"
public Group ele0Group() { return c0Group; }
- // 'type' name = ID
+ // "type" name = ID
public Group ele00Group() { return c00Group; }
- // 'type'
+ // "type"
public Keyword ele000KeywordType() { return c000KeywordType; }
// name = ID
@@ -93,7 +93,7 @@ public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess imple
// ID
public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
- // 'extends'
+ // "extends"
public Keyword ele01KeywordExtends() { return c01KeywordExtends; }
// ^extends = [ Type ]
@@ -131,12 +131,12 @@ public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess imple
return (pMain != null) ? pMain : (pMain = new MainElements());
}
- // Import : 'import' importURI = STRING ;
+ // Import : "import" importURI = STRING ;
public ImportElements prImport() {
return (pImport != null) ? pImport : (pImport = new ImportElements());
}
- // Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ // Type : "type" name = ID "extends" ^extends = [ Type ] ;
public TypeElements prType() {
return (pType != null) ? pType : (pType = new TypeElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
index ff63e7a..65d3bb6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
@@ -44,13 +44,13 @@ public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implement
private final Assignment c1AssignmentUri = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentUri.eContents().get(0);
- // Import : 'import' uri = STRING ;
+ // Import : "import" uri = STRING ;
public ParserRule getRule() { return rule; }
- // 'import' uri = STRING
+ // "import" uri = STRING
public Group eleGroup() { return cGroup; }
- // 'import'
+ // "import"
public Keyword ele0KeywordImport() { return c0KeywordImport; }
// uri = STRING
@@ -72,19 +72,19 @@ public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implement
private final Assignment c1AssignmentExtends = (Assignment)cGroup.eContents().get(1);
private final CrossReference c10CrossReferenceEStringType = (CrossReference)c1AssignmentExtends.eContents().get(0);
- // Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ // Type : "type" name = ID "extends" ^extends = [ Type ] ;
public ParserRule getRule() { return rule; }
- // 'type' name = ID 'extends' ^extends = [ Type ]
+ // "type" name = ID "extends" ^extends = [ Type ]
public Group eleGroup() { return cGroup; }
- // 'type' name = ID 'extends'
+ // "type" name = ID "extends"
public Group ele0Group() { return c0Group; }
- // 'type' name = ID
+ // "type" name = ID
public Group ele00Group() { return c00Group; }
- // 'type'
+ // "type"
public Keyword ele000KeywordType() { return c000KeywordType; }
// name = ID
@@ -93,7 +93,7 @@ public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implement
// ID
public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
- // 'extends'
+ // "extends"
public Keyword ele01KeywordExtends() { return c01KeywordExtends; }
// ^extends = [ Type ]
@@ -131,12 +131,12 @@ public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implement
return (pMain != null) ? pMain : (pMain = new MainElements());
}
- // Import : 'import' uri = STRING ;
+ // Import : "import" uri = STRING ;
public ImportElements prImport() {
return (pImport != null) ? pImport : (pImport = new ImportElements());
}
- // Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
+ // Type : "type" name = ID "extends" ^extends = [ Type ] ;
public TypeElements prType() {
return (pType != null) ? pType : (pType = new TypeElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
index 178f1ee..7950503 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java
@@ -56,24 +56,30 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
index f920df7..c938617 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
@@ -67,12 +67,12 @@ protected class Model_Assignment_elements extends AssignmentToken {
/************ begin Rule Element ****************
*
- * Element : ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';' ;
+ * Element : ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) * ";" ;
*
**/
-// ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';'
+// ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) * ";"
protected class Element_Group extends GroupToken {
public Element_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -100,7 +100,7 @@ protected class Element_Group extends GroupToken {
}
}
-// ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) *
+// ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) *
protected class Element_0_Group extends GroupToken {
public Element_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -128,7 +128,7 @@ protected class Element_0_Group extends GroupToken {
}
}
-// ( optional ?= 'optional' ) ? 'element' name = ID
+// ( optional ?= "optional" ) ? "element" name = ID
protected class Element_0_0_Group extends GroupToken {
public Element_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -156,7 +156,7 @@ protected class Element_0_0_Group extends GroupToken {
}
}
-// ( optional ?= 'optional' ) ? 'element'
+// ( optional ?= "optional" ) ? "element"
protected class Element_0_0_0_Group extends GroupToken {
public Element_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -184,7 +184,7 @@ protected class Element_0_0_0_Group extends GroupToken {
}
}
-// ( optional ?= 'optional' ) ?
+// ( optional ?= "optional" ) ?
protected class Element_0_0_0_0_Assignment_optional extends AssignmentToken {
public Element_0_0_0_0_Assignment_optional(IInstanceDescription curr, AbstractToken pred) {
@@ -209,7 +209,7 @@ protected class Element_0_0_0_0_Assignment_optional extends AssignmentToken {
}
}
-// 'element'
+// "element"
protected class Element_0_0_0_1_Keyword_element extends KeywordToken {
public Element_0_0_0_1_Keyword_element(IInstanceDescription curr, AbstractToken pred) {
@@ -270,7 +270,7 @@ protected class Element_0_1_Assignment_descriptions extends AssignmentToken {
}
-// ';'
+// ";"
protected class Element_1_Keyword extends KeywordToken {
public Element_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
index f38d0c5..253f7e5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
@@ -40,28 +40,28 @@ public class DummyTestLanguageGrammarAccess extends BaseEPackageAccess implement
private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentDescriptions.eContents().get(0);
private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
- // Element : ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';' ;
+ // Element : ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) * ";" ;
public ParserRule getRule() { return rule; }
- // ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';'
+ // ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) * ";"
public Group eleGroup() { return cGroup; }
- // ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) *
+ // ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) *
public Group ele0Group() { return c0Group; }
- // ( optional ?= 'optional' ) ? 'element' name = ID
+ // ( optional ?= "optional" ) ? "element" name = ID
public Group ele00Group() { return c00Group; }
- // ( optional ?= 'optional' ) ? 'element'
+ // ( optional ?= "optional" ) ? "element"
public Group ele000Group() { return c000Group; }
- // ( optional ?= 'optional' ) ?
+ // ( optional ?= "optional" ) ?
public Assignment ele0000AssignmentOptional() { return c0000AssignmentOptional; }
- // 'optional'
+ // "optional"
public Keyword ele00000KeywordOptional() { return c00000KeywordOptional; }
- // 'element'
+ // "element"
public Keyword ele0001KeywordElement() { return c0001KeywordElement; }
// name = ID
@@ -76,7 +76,7 @@ public class DummyTestLanguageGrammarAccess extends BaseEPackageAccess implement
// STRING
public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
- // ';'
+ // ";"
public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
}
@@ -107,7 +107,7 @@ public class DummyTestLanguageGrammarAccess extends BaseEPackageAccess implement
return (pModel != null) ? pModel : (pModel = new ModelElements());
}
- // Element : ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';' ;
+ // Element : ( optional ?= "optional" ) ? "element" name = ID ( descriptions += STRING ) * ";" ;
public ElementElements prElement() {
return (pElement != null) ? pElement : (pElement = new ElementElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
index e584462..2ebdc6d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java
@@ -45,12 +45,15 @@ public final class AbstractTestLanguageInheritedParserRuleConsumer extends NonTe
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
index e96d514..f8657f7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java
@@ -50,20 +50,25 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
index 29c31a6..ccc7bbc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
@@ -27,12 +27,12 @@ public class ConcreteTestLanguageParseTreeConstructor extends AbstractParseTreeC
/************ begin Rule ConcreteParserRule ****************
*
- * ConcreteParserRule : 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) * ;
+ * ConcreteParserRule : "model" magicNumber = REAL ":" ( elements += InheritedParserRule ) * ;
*
**/
-// 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) *
+// "model" magicNumber = REAL ":" ( elements += InheritedParserRule ) *
protected class ConcreteParserRule_Group extends GroupToken {
public ConcreteParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -60,7 +60,7 @@ protected class ConcreteParserRule_Group extends GroupToken {
}
}
-// 'model' magicNumber = REAL ':'
+// "model" magicNumber = REAL ":"
protected class ConcreteParserRule_0_Group extends GroupToken {
public ConcreteParserRule_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -88,7 +88,7 @@ protected class ConcreteParserRule_0_Group extends GroupToken {
}
}
-// 'model' magicNumber = REAL
+// "model" magicNumber = REAL
protected class ConcreteParserRule_0_0_Group extends GroupToken {
public ConcreteParserRule_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -116,7 +116,7 @@ protected class ConcreteParserRule_0_0_Group extends GroupToken {
}
}
-// 'model'
+// "model"
protected class ConcreteParserRule_0_0_0_Keyword_model extends KeywordToken {
public ConcreteParserRule_0_0_0_Keyword_model(IInstanceDescription curr, AbstractToken pred) {
@@ -152,7 +152,7 @@ protected class ConcreteParserRule_0_0_1_Assignment_magicNumber extends Assignme
}
-// ':'
+// ":"
protected class ConcreteParserRule_0_1_Keyword extends KeywordToken {
public ConcreteParserRule_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -202,12 +202,12 @@ protected class ConcreteParserRule_1_Assignment_elements extends AssignmentToken
/************ begin Rule InheritedParserRule ****************
*
- * InheritedParserRule returns AType : 'element' name = ID ;
+ * InheritedParserRule returns AType : "element" name = ID ;
*
**/
-// 'element' name = ID
+// "element" name = ID
protected class InheritedParserRule_Group extends GroupToken {
public InheritedParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -235,7 +235,7 @@ protected class InheritedParserRule_Group extends GroupToken {
}
}
-// 'element'
+// "element"
protected class InheritedParserRule_0_Keyword_element extends KeywordToken {
public InheritedParserRule_0_Keyword_element(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
index 154c147..7f25c18 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
@@ -17,13 +17,13 @@ public class AbstractTestLanguageGrammarAccess extends BaseEPackageAccess implem
private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
- // InheritedParserRule returns AType : 'element' name = ID ;
+ // InheritedParserRule returns AType : "element" name = ID ;
public ParserRule getRule() { return rule; }
- // 'element' name = ID
+ // "element" name = ID
public Group eleGroup() { return cGroup; }
- // 'element'
+ // "element"
public Keyword ele0KeywordElement() { return c0KeywordElement; }
// name = ID
@@ -56,17 +56,17 @@ public class AbstractTestLanguageGrammarAccess extends BaseEPackageAccess implem
}
- // InheritedParserRule returns AType : 'element' name = ID ;
+ // InheritedParserRule returns AType : "element" name = ID ;
public InheritedParserRuleElements prInheritedParserRule() {
return (pInheritedParserRule != null) ? pInheritedParserRule : (pInheritedParserRule = new InheritedParserRuleElements());
}
- // lexer REAL returns EDouble : "RULE_INT '.' RULE_INT" ;
+ // lexer REAL returns EDouble : "RULE_INT \'.\' RULE_INT" ;
public LexerRule lrREAL() {
return (lREAL != null) ? lREAL : (lREAL = (LexerRule) getGrammar().eContents().get(3));
}
- // lexer ID : "('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*" ;
+ // lexer ID : "(\'^\')?(\'a\'..\'z\'|\'A\'..\'Z\'|\'\u00F6\'|\'\u00E4\'|\'\u00FC\'|\'_\') (\'a\'..\'z\'|\'A\'..\'Z\'|\'_\'|\'0\'..\'9\')*" ;
public LexerRule lrID() {
return (lID != null) ? lID : (lID = (LexerRule) getGrammar().eContents().get(4));
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index 7590020..d5df0a0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -22,19 +22,19 @@ public class ConcreteTestLanguageGrammarAccess extends BaseEPackageAccess implem
private final Assignment c1AssignmentElements = (Assignment)cGroup.eContents().get(1);
private final RuleCall c10ParserRuleCallInheritedParserRule = (RuleCall)c1AssignmentElements.eContents().get(0);
- // ConcreteParserRule : 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) * ;
+ // ConcreteParserRule : "model" magicNumber = REAL ":" ( elements += InheritedParserRule ) * ;
public ParserRule getRule() { return rule; }
- // 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) *
+ // "model" magicNumber = REAL ":" ( elements += InheritedParserRule ) *
public Group eleGroup() { return cGroup; }
- // 'model' magicNumber = REAL ':'
+ // "model" magicNumber = REAL ":"
public Group ele0Group() { return c0Group; }
- // 'model' magicNumber = REAL
+ // "model" magicNumber = REAL
public Group ele00Group() { return c00Group; }
- // 'model'
+ // "model"
public Keyword ele000KeywordModel() { return c000KeywordModel; }
// magicNumber = REAL
@@ -43,7 +43,7 @@ public class ConcreteTestLanguageGrammarAccess extends BaseEPackageAccess implem
// REAL
public RuleCall ele0010LexerRuleCallREAL() { return c0010LexerRuleCallREAL; }
- // ':'
+ // ":"
public Keyword ele01KeywordColon() { return c01KeywordColon; }
// ( elements += InheritedParserRule ) *
@@ -74,7 +74,7 @@ public class ConcreteTestLanguageGrammarAccess extends BaseEPackageAccess implem
}
- // ConcreteParserRule : 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) * ;
+ // ConcreteParserRule : "model" magicNumber = REAL ":" ( elements += InheritedParserRule ) * ;
public ConcreteParserRuleElements prConcreteParserRule() {
return (pConcreteParserRule != null) ? pConcreteParserRule : (pConcreteParserRule = new ConcreteParserRuleElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
index 58a985e..d775328 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java
@@ -44,12 +44,15 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
index b8050b4..2abc98d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java
@@ -44,12 +44,15 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer
final IMarker marker = mark();
if (!consumeAssignment$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
index 8007b5f..ce493d8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java
@@ -54,12 +54,15 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons
final IMarker marker = mark();
if (!consumeKeyword$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
index cc61e86..dcc4950 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java
@@ -48,12 +48,15 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -70,12 +73,15 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
index 35a0a76..0e6b875 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java
@@ -57,24 +57,30 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$19()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -93,12 +99,15 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -121,12 +130,15 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$13()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -149,12 +161,15 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeKeyword$16()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$17()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
index 4a64e1f..5307708 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java
@@ -48,16 +48,20 @@ public final class DatatypeRulesTestLanguageModelIdConsumer extends NonTerminalC
final IMarker marker = mark();
if (!consumeRuleCall$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
index 1409ada..fe412b7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java
@@ -42,16 +42,20 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer
final IMarker marker = mark();
if (!consumeRuleCall$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
index 0220584..ac34033 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java
@@ -51,20 +51,25 @@ public final class DatatypeRulesTestLanguageVectorConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java
index b235977..2059b0b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java
@@ -67,12 +67,12 @@ protected class CompositeModel_Assignment_model extends AssignmentToken {
/************ begin Rule Model ****************
*
- * Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ;
+ * Model : id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ? ";" ;
*
**/
-// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';'
+// id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ? ";"
protected class Model_Group extends GroupToken {
public Model_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -100,7 +100,7 @@ protected class Model_Group extends GroupToken {
}
}
-// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ?
+// id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ?
protected class Model_0_Group extends GroupToken {
public Model_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -128,7 +128,7 @@ protected class Model_0_Group extends GroupToken {
}
}
-// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ?
+// id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ?
protected class Model_0_0_Group extends GroupToken {
public Model_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -156,7 +156,7 @@ protected class Model_0_0_Group extends GroupToken {
}
}
-// id = NestedModelId ( ':' value = Fraction ) ?
+// id = NestedModelId ( ":" value = Fraction ) ?
protected class Model_0_0_0_Group extends GroupToken {
public Model_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -209,7 +209,7 @@ protected class Model_0_0_0_0_Assignment_id extends AssignmentToken {
}
}
-// ( ':' value = Fraction ) ?
+// ( ":" value = Fraction ) ?
protected class Model_0_0_0_1_Group extends GroupToken {
public Model_0_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -237,7 +237,7 @@ protected class Model_0_0_0_1_Group extends GroupToken {
}
}
-// ':'
+// ":"
protected class Model_0_0_0_1_0_Keyword extends KeywordToken {
public Model_0_0_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -276,7 +276,7 @@ protected class Model_0_0_0_1_1_Assignment_value extends AssignmentToken {
-// ( '#' vector = Vector ) ?
+// ( "#" vector = Vector ) ?
protected class Model_0_0_1_Group extends GroupToken {
public Model_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -304,7 +304,7 @@ protected class Model_0_0_1_Group extends GroupToken {
}
}
-// '#'
+// "#"
protected class Model_0_0_1_0_Keyword extends KeywordToken {
public Model_0_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -343,7 +343,7 @@ protected class Model_0_0_1_1_Assignment_vector extends AssignmentToken {
-// ( '+' dots = Dots ) ?
+// ( "+" dots = Dots ) ?
protected class Model_0_1_Group extends GroupToken {
public Model_0_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -371,7 +371,7 @@ protected class Model_0_1_Group extends GroupToken {
}
}
-// '+'
+// "+"
protected class Model_0_1_0_Keyword extends KeywordToken {
public Model_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -410,7 +410,7 @@ protected class Model_0_1_1_Assignment_dots extends AssignmentToken {
-// ';'
+// ";"
protected class Model_1_Keyword extends KeywordToken {
public Model_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
index c540db6..0c20d90 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java
@@ -47,19 +47,19 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final RuleCall c0110ParserRuleCallDots = (RuleCall)c011AssignmentDots.eContents().get(0);
private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
- // Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ;
+ // Model : id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ? ";" ;
public ParserRule getRule() { return rule; }
- // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';'
+ // id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ? ";"
public Group eleGroup() { return cGroup; }
- // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ?
+ // id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ?
public Group ele0Group() { return c0Group; }
- // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ?
+ // id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ?
public Group ele00Group() { return c00Group; }
- // id = NestedModelId ( ':' value = Fraction ) ?
+ // id = NestedModelId ( ":" value = Fraction ) ?
public Group ele000Group() { return c000Group; }
// id = NestedModelId
@@ -68,10 +68,10 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
// NestedModelId
public RuleCall ele00000ParserRuleCallNestedModelId() { return c00000ParserRuleCallNestedModelId; }
- // ( ':' value = Fraction ) ?
+ // ( ":" value = Fraction ) ?
public Group ele0001Group() { return c0001Group; }
- // ':'
+ // ":"
public Keyword ele00010KeywordColon() { return c00010KeywordColon; }
// value = Fraction
@@ -80,10 +80,10 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
// Fraction
public RuleCall ele000110ParserRuleCallFraction() { return c000110ParserRuleCallFraction; }
- // ( '#' vector = Vector ) ?
+ // ( "#" vector = Vector ) ?
public Group ele001Group() { return c001Group; }
- // '#'
+ // "#"
public Keyword ele0010KeywordNumberSign() { return c0010KeywordNumberSign; }
// vector = Vector
@@ -92,10 +92,10 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
// Vector
public RuleCall ele00110ParserRuleCallVector() { return c00110ParserRuleCallVector; }
- // ( '+' dots = Dots ) ?
+ // ( "+" dots = Dots ) ?
public Group ele01Group() { return c01Group; }
- // '+'
+ // "+"
public Keyword ele010KeywordPlusSign() { return c010KeywordPlusSign; }
// dots = Dots
@@ -104,7 +104,7 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
// Dots
public RuleCall ele0110ParserRuleCallDots() { return c0110ParserRuleCallDots; }
- // ';'
+ // ";"
public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
}
@@ -116,19 +116,19 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final Keyword c01KeywordFullStop = (Keyword)c0Group.eContents().get(1);
private final RuleCall c1LexerRuleCallID = (RuleCall)cGroup.eContents().get(1);
- // ModelId returns EString : ID '.' ID ;
+ // ModelId returns EString : ID "." ID ;
public ParserRule getRule() { return rule; }
- // ID '.' ID
+ // ID "." ID
public Group eleGroup() { return cGroup; }
- // ID '.'
+ // ID "."
public Group ele0Group() { return c0Group; }
// ID
public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
- // '.'
+ // "."
public Keyword ele01KeywordFullStop() { return c01KeywordFullStop; }
// ID
@@ -143,19 +143,19 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final Keyword c01KeywordFullStop = (Keyword)c0Group.eContents().get(1);
private final RuleCall c1ParserRuleCallModelId = (RuleCall)cGroup.eContents().get(1);
- // NestedModelId returns EString : ModelId '.' ModelId ;
+ // NestedModelId returns EString : ModelId "." ModelId ;
public ParserRule getRule() { return rule; }
- // ModelId '.' ModelId
+ // ModelId "." ModelId
public Group eleGroup() { return cGroup; }
- // ModelId '.'
+ // ModelId "."
public Group ele0Group() { return c0Group; }
// ModelId
public RuleCall ele00ParserRuleCallModelId() { return c00ParserRuleCallModelId; }
- // '.'
+ // "."
public Keyword ele01KeywordFullStop() { return c01KeywordFullStop; }
// ModelId
@@ -170,19 +170,19 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final Keyword c10KeywordSolidus = (Keyword)c1Group.eContents().get(0);
private final RuleCall c11LexerRuleCallINT = (RuleCall)c1Group.eContents().get(1);
- // Fraction returns EBigDecimal : INT ( '/' INT ) ? ;
+ // Fraction returns EBigDecimal : INT ( "/" INT ) ? ;
public ParserRule getRule() { return rule; }
- // INT ( '/' INT ) ?
+ // INT ( "/" INT ) ?
public Group eleGroup() { return cGroup; }
// INT
public RuleCall ele0LexerRuleCallINT() { return c0LexerRuleCallINT; }
- // ( '/' INT ) ?
+ // ( "/" INT ) ?
public Group ele1Group() { return c1Group; }
- // '/'
+ // "/"
public Keyword ele10KeywordSolidus() { return c10KeywordSolidus; }
// INT
@@ -199,19 +199,19 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final RuleCall c01LexerRuleCallINT = (RuleCall)c0Group.eContents().get(1);
private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
- // Vector returns EString : '(' INT INT ')' ;
+ // Vector returns EString : "(" INT INT ")" ;
public ParserRule getRule() { return rule; }
- // '(' INT INT ')'
+ // "(" INT INT ")"
public Group eleGroup() { return cGroup; }
- // '(' INT INT
+ // "(" INT INT
public Group ele0Group() { return c0Group; }
- // '(' INT
+ // "(" INT
public Group ele00Group() { return c00Group; }
- // '('
+ // "("
public Keyword ele000KeywordLeftParenthesis() { return c000KeywordLeftParenthesis; }
// INT
@@ -220,7 +220,7 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
// INT
public RuleCall ele01LexerRuleCallINT() { return c01LexerRuleCallINT; }
- // ')'
+ // ")"
public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
}
@@ -232,22 +232,22 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
private final Keyword c01KeywordFullStop = (Keyword)c0Group.eContents().get(1);
private final Keyword c1KeywordFullStopFullStop = (Keyword)cAlternatives.eContents().get(1);
- // Dots returns EString : '.' '.' | '..' ;
+ // Dots returns EString : "." "." | ".." ;
public ParserRule getRule() { return rule; }
- // '.' '.' | '..'
+ // "." "." | ".."
public Alternatives eleAlternatives() { return cAlternatives; }
- // '.' '.'
+ // "." "."
public Group ele0Group() { return c0Group; }
- // '.'
+ // "."
public Keyword ele00KeywordFullStop() { return c00KeywordFullStop; }
- // '.'
+ // "."
public Keyword ele01KeywordFullStop() { return c01KeywordFullStop; }
- // '..'
+ // ".."
public Keyword ele1KeywordFullStopFullStop() { return c1KeywordFullStopFullStop; }
}
@@ -283,32 +283,32 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i
return (pCompositeModel != null) ? pCompositeModel : (pCompositeModel = new CompositeModelElements());
}
- // Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ;
+ // Model : id = NestedModelId ( ":" value = Fraction ) ? ( "#" vector = Vector ) ? ( "+" dots = Dots ) ? ";" ;
public ModelElements prModel() {
return (pModel != null) ? pModel : (pModel = new ModelElements());
}
- // ModelId returns EString : ID '.' ID ;
+ // ModelId returns EString : ID "." ID ;
public ModelIdElements prModelId() {
return (pModelId != null) ? pModelId : (pModelId = new ModelIdElements());
}
- // NestedModelId returns EString : ModelId '.' ModelId ;
+ // NestedModelId returns EString : ModelId "." ModelId ;
public NestedModelIdElements prNestedModelId() {
return (pNestedModelId != null) ? pNestedModelId : (pNestedModelId = new NestedModelIdElements());
}
- // Fraction returns EBigDecimal : INT ( '/' INT ) ? ;
+ // Fraction returns EBigDecimal : INT ( "/" INT ) ? ;
public FractionElements prFraction() {
return (pFraction != null) ? pFraction : (pFraction = new FractionElements());
}
- // Vector returns EString : '(' INT INT ')' ;
+ // Vector returns EString : "(" INT INT ")" ;
public VectorElements prVector() {
return (pVector != null) ? pVector : (pVector = new VectorElements());
}
- // Dots returns EString : '.' '.' | '..' ;
+ // Dots returns EString : "." "." | ".." ;
public DotsElements prDots() {
return (pDots != null) ? pDots : (pDots = new DotsElements());
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java
index dae36ef..e426c8a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java
@@ -52,12 +52,15 @@ public final class XtextGrammarTestLanguageAbstractTokenConsumer extends NonTerm
final IMarker marker = mark();
if (!consumeAlternatives$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java
index e07d592..31c7219 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java
@@ -68,36 +68,45 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$14()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$17()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$21()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$22()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -114,12 +123,15 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon
final IMarker marker = mark();
if (!consumeKeyword$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
index 15a2c2a..319b2ca 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java
@@ -42,12 +42,15 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -64,16 +67,20 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeAction$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$5() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java
index d5cc52f..2874b7c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java
@@ -53,16 +53,20 @@ public final class XtextGrammarTestLanguageAssignmentConsumer extends NonTermina
final IMarker marker = mark();
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
index e5e07db..62ee1a4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java
@@ -42,12 +42,15 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -64,16 +67,20 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer
final IMarker marker = mark();
if (!consumeAction$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$5() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
index 61f7a0e..36b93b4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java
@@ -53,20 +53,25 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -89,12 +94,15 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
index 1ed2042..1bd3e8a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java
@@ -56,20 +56,25 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$10()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -98,12 +103,15 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No
final IMarker marker = mark();
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java
index cf907ed..8bcc768 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java
@@ -70,28 +70,35 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeAlternatives$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$16()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$25()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$27()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -128,12 +135,15 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeKeyword$13()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$14()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -156,16 +166,20 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeKeyword$18()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$19()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$21()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -188,12 +202,15 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeKeyword$22()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$23()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
index 718e7c9..99c8576 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java
@@ -39,12 +39,15 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -61,12 +64,15 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons
final IMarker marker = mark();
if (!consumeAction$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$4() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java
index 6f28d86..4161ce7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java
@@ -64,28 +64,35 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeAlternatives$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$16()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$18()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -120,12 +127,15 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$13()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java
index ae99c45..e6b638f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java
@@ -42,12 +42,15 @@ public final class XtextGrammarTestLanguageNegatedTokenConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java
index 4a9c935..cfa60d8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java
@@ -45,16 +45,20 @@ public final class XtextGrammarTestLanguageParenthesizedElementConsumer extends
final IMarker marker = mark();
if (!consumeKeyword$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java
index 29c1cdc..866220b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java
@@ -45,16 +45,20 @@ public final class XtextGrammarTestLanguageParenthesizedTerminalElementConsumer
final IMarker marker = mark();
if (!consumeKeyword$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeRuleCall$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$5()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
index b357d99..e3b0ce7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java
@@ -73,28 +73,35 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina
final IMarker marker = mark();
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$28()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$29()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$31()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -113,12 +120,15 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina
final IMarker marker = mark();
if (!consumeKeyword$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$10()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -141,28 +151,35 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina
final IMarker marker = mark();
if (!consumeAssignment$16()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$18()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$19()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$23()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$24()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$27()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
index 8df9a2a..90dda28 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java
@@ -53,16 +53,20 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N
final IMarker marker = mark();
if (!consumeKeyword$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -85,12 +89,15 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
index 528711e..014d61c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java
@@ -42,12 +42,15 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -64,16 +67,20 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends
final IMarker marker = mark();
if (!consumeAction$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$5() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
index daecad2..643f4c6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java
@@ -39,12 +39,15 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -61,12 +64,15 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm
final IMarker marker = mark();
if (!consumeAction$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$4() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java
index 737cd83..f60af22 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java
@@ -58,28 +58,35 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeAssignment$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$14()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$17()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -104,12 +111,15 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java
index 7bd967c..cc70c16 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java
@@ -48,12 +48,15 @@ public final class XtextGrammarTestLanguageTerminalTokenConsumer extends NonTerm
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
index ab87c2f..ab86a57 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java
@@ -48,12 +48,15 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeGroup$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -66,12 +69,15 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo
final IMarker marker = mark();
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$6()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java
index 03c7e92..cd8ffb7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java
@@ -42,12 +42,15 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeKeyword$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi
index 13efb59..f7c4448 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xmi
@@ -112,7 +112,7 @@
<abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
<abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
<groups xsi:type="xtext:Group">
- <abstractTokens xsi:type="xtext:Keyword" value="\\"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
<abstractTokens xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -133,12 +133,12 @@
</groups>
<groups xsi:type="xtext:Keyword" value="'"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
</abstractTokens>
</groups>
<groups xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
<groups xsi:type="xtext:Keyword" value="&quot;"/>
</terminal>
</groups>
@@ -151,7 +151,7 @@
<abstractTokens xsi:type="xtext:Keyword" value="'"/>
<abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
<groups xsi:type="xtext:Group">
- <abstractTokens xsi:type="xtext:Keyword" value="\\"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
<abstractTokens xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -172,12 +172,12 @@
</groups>
<groups xsi:type="xtext:Keyword" value="'"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
</abstractTokens>
</groups>
<groups xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
<groups xsi:type="xtext:Keyword" value="'"/>
</terminal>
</groups>
@@ -207,14 +207,14 @@
<abstractTokens xsi:type="xtext:Keyword" value="//"/>
<abstractTokens xsi:type="xtext:NegatedToken" cardinality="*">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\n"/>
- <groups xsi:type="xtext:Keyword" value="\r"/>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
- <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="\r"/>
- <abstractTokens xsi:type="xtext:Keyword" value="\n"/>
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="&#xA;"/>
</abstractTokens>
</alternatives>
</rules>
@@ -226,11 +226,11 @@
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Keyword" value=" "/>
- <groups xsi:type="xtext:Keyword" value="\t"/>
+ <groups xsi:type="xtext:Keyword" value="&#x9;"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\r"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\n"/>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi
index 4914986..632ba42 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi
@@ -204,7 +204,7 @@
</terminal>
</abstractTokens>
</abstractTokens>
- <abstractTokens xsi:type="xtext:Group">
+ <abstractTokens xsi:type="xtext:Group" cardinality="*">
<abstractTokens xsi:type="xtext:Keyword" value=","/>
<abstractTokens xsi:type="xtext:Assignment" feature="hiddenTokens" operator="+=">
<terminal xsi:type="xtext:CrossReference" rule="//@rules.29">
@@ -688,7 +688,7 @@
<abstractTokens xsi:type="xtext:Keyword" value="&quot;"/>
<abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
<groups xsi:type="xtext:Group">
- <abstractTokens xsi:type="xtext:Keyword" value="\\"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
<abstractTokens xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -709,12 +709,12 @@
</groups>
<groups xsi:type="xtext:Keyword" value="'"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
</abstractTokens>
</groups>
<groups xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
<groups xsi:type="xtext:Keyword" value="&quot;"/>
</terminal>
</groups>
@@ -727,7 +727,7 @@
<abstractTokens xsi:type="xtext:Keyword" value="'"/>
<abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
<groups xsi:type="xtext:Group">
- <abstractTokens xsi:type="xtext:Keyword" value="\\"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="\"/>
<abstractTokens xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
@@ -748,12 +748,12 @@
</groups>
<groups xsi:type="xtext:Keyword" value="'"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
</abstractTokens>
</groups>
<groups xsi:type="xtext:NegatedToken">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\\"/>
+ <groups xsi:type="xtext:Keyword" value="\"/>
<groups xsi:type="xtext:Keyword" value="'"/>
</terminal>
</groups>
@@ -783,14 +783,14 @@
<abstractTokens xsi:type="xtext:Keyword" value="//"/>
<abstractTokens xsi:type="xtext:NegatedToken" cardinality="*">
<terminal xsi:type="xtext:Alternatives">
- <groups xsi:type="xtext:Keyword" value="\n"/>
- <groups xsi:type="xtext:Keyword" value="\r"/>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
</terminal>
</abstractTokens>
</abstractTokens>
<abstractTokens xsi:type="xtext:Group" cardinality="?">
- <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="\r"/>
- <abstractTokens xsi:type="xtext:Keyword" value="\n"/>
+ <abstractTokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+ <abstractTokens xsi:type="xtext:Keyword" value="&#xA;"/>
</abstractTokens>
</alternatives>
</rules>
@@ -802,11 +802,11 @@
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Alternatives">
<groups xsi:type="xtext:Keyword" value=" "/>
- <groups xsi:type="xtext:Keyword" value="\t"/>
+ <groups xsi:type="xtext:Keyword" value="&#x9;"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\r"/>
+ <groups xsi:type="xtext:Keyword" value="&#xD;"/>
</groups>
- <groups xsi:type="xtext:Keyword" value="\n"/>
+ <groups xsi:type="xtext:Keyword" value="&#xA;"/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g
index 8f67021..a3d2908 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g
@@ -270,7 +270,7 @@ RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java
index b3cda95..cd922f4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguageLexer.java
@@ -156,10 +156,10 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:13: ( ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -171,16 +171,16 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("273:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("273:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:16: '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:20: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -196,7 +196,7 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:21: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273: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' ) {
@@ -213,7 +213,7 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:74: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:76: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -239,10 +239,10 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:94: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:99: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -258,7 +258,7 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:100: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -275,7 +275,7 @@ public class InternalTerminalRulesTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:153: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g:273:158: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g
index f4a19f9..6ae2ae0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage__.g
@@ -18,7 +18,7 @@ RULE_INT : ('0'..'9')+;
// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalTerminalRulesTestLanguage.g" 273
-RULE_STRING : ('"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g
index fe50ca9..4072438 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g
@@ -710,7 +710,7 @@ ruleParserRule returns [EObject current=null]
}
)
-)))')'
+))*)')'
{
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1" /* xtext::Keyword */, null);
}
@@ -2242,7 +2242,7 @@ RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java
index 122c979..39030e8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageLexer.java
@@ -800,10 +800,10 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:13: ( ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:13: ( ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -815,16 +815,16 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2245:15: ( '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("2245:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:16: '\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"'
{
match('\"');
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:20: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -840,7 +840,7 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:21: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245: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' ) {
@@ -857,7 +857,7 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:74: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:76: ~ ( ( '\\\\' | '\\\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -883,10 +883,10 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:94: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:99: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -902,7 +902,7 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:100: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\"' ) | '\\'' ) | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -919,7 +919,7 @@ public class InternalXtextTerminalsTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:153: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2245:158: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java
index 058f38a..5d71b70 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguageParser.java
@@ -1386,7 +1386,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// $ANTLR start ruleParserRule
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:605:1: ruleParserRule returns [EObject current=null] : ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:605:1: ruleParserRule returns [EObject current=null] : ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ;
public final EObject ruleParserRule() throws RecognitionException {
EObject current = null;
@@ -1400,20 +1400,20 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:609:6: ( ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:1: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:609:6: ( ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:1: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:1: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:2: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';'
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:1: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:2: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';'
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:2: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:3: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:2: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:3: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' ) (lv_alternatives= ruleAlternatives )
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:3: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':' )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:4: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? ) ':'
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:3: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':' )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:4: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? ) ':'
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:4: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )? )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:5: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )?
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:4: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )? )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:5: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )?
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:5: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:610:6: (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )?
@@ -1491,19 +1491,19 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:5: ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')' )?
- int alt15=2;
- int LA15_0 = input.LA(1);
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:5: ( ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' )?
+ int alt16=2;
+ int LA16_0 = input.LA(1);
- if ( (LA15_0==23) ) {
- alt15=1;
+ if ( (LA16_0==23) ) {
+ alt16=1;
}
- switch (alt15) {
+ switch (alt16) {
case 1 :
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:6: ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) ) ')'
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:6: ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')'
{
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:6: ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:7: ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:6: ( ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:7: ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )*
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:7: ( ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) ) )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:655:8: ( (lv_definesHiddenTokens= 'hidden' ) '(' ) ( ( RULE_ID ) )
@@ -1566,42 +1566,60 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:694:3: ( ',' ( ( RULE_ID ) ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:694:4: ',' ( ( RULE_ID ) )
- {
- match(input,25,FOLLOW_25_in_ruleParserRule1493);
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:694:3: ( ',' ( ( RULE_ID ) ) )*
+ loop15:
+ do {
+ int alt15=2;
+ int LA15_0 = input.LA(1);
- createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
-
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:698:1: ( ( RULE_ID ) )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:701:3: ( RULE_ID )
- {
+ if ( (LA15_0==25) ) {
+ alt15=1;
+ }
- if (current==null) {
- current = factory.create("ParserRule");
- associateNodeWithAstElement(currentNode, current);
- }
-
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:707:1: ( RULE_ID )
- // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:708:2: RULE_ID
- {
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1517);
-
- createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "hiddenTokens");
-
- }
+ switch (alt15) {
+ case 1 :
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:694:4: ',' ( ( RULE_ID ) )
+ {
+ match(input,25,FOLLOW_25_in_ruleParserRule1493);
+ createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
+
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:698:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:701:3: ( RULE_ID )
+ {
- }
+ if (current==null) {
+ current = factory.create("ParserRule");
+ associateNodeWithAstElement(currentNode, current);
+ }
+
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:707:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:708:2: RULE_ID
+ {
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1517);
+
+ createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "hiddenTokens");
+
+
+ }
- }
+ }
+
+
+ }
+ break;
+
+ default :
+ break loop15;
+ }
+ } while (true);
}
- match(input,26,FOLLOW_26_in_ruleParserRule1532);
+ match(input,26,FOLLOW_26_in_ruleParserRule1533);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -1614,7 +1632,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,21,FOLLOW_21_in_ruleParserRule1544);
+ match(input,21,FOLLOW_21_in_ruleParserRule1545);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -1627,7 +1645,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_ruleParserRule1579);
+ pushFollow(FOLLOW_ruleAlternatives_in_ruleParserRule1580);
lv_alternatives=ruleAlternatives();
_fsp--;
@@ -1650,7 +1668,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,22,FOLLOW_22_in_ruleParserRule1593);
+ match(input,22,FOLLOW_22_in_ruleParserRule1594);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -1688,12 +1706,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:756:2: iv_ruleTerminalRule= ruleTerminalRule EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1628);
+ pushFollow(FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1629);
iv_ruleTerminalRule=ruleTerminalRule();
_fsp--;
current =iv_ruleTerminalRule;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalRule1638);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalRule1639);
}
@@ -1747,7 +1765,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:770:6: lv_terminal= 'terminal'
{
lv_terminal=(Token)input.LT(1);
- match(input,27,FOLLOW_27_in_ruleTerminalRule1688);
+ match(input,27,FOLLOW_27_in_ruleTerminalRule1689);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::Keyword */, "terminal");
@@ -1770,7 +1788,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:790:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTerminalRule1721);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTerminalRule1722);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name");
@@ -1793,17 +1811,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:808:3: ( 'returns' (lv_type= ruleTypeRef ) )?
- int alt16=2;
- int LA16_0 = input.LA(1);
+ int alt17=2;
+ int LA17_0 = input.LA(1);
- if ( (LA16_0==20) ) {
- alt16=1;
+ if ( (LA17_0==20) ) {
+ alt17=1;
}
- switch (alt16) {
+ switch (alt17) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:808:4: 'returns' (lv_type= ruleTypeRef )
{
- match(input,20,FOLLOW_20_in_ruleTerminalRule1743);
+ match(input,20,FOLLOW_20_in_ruleTerminalRule1744);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
@@ -1813,7 +1831,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleTerminalRule1777);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleTerminalRule1778);
lv_type=ruleTypeRef();
_fsp--;
@@ -1842,7 +1860,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,21,FOLLOW_21_in_ruleTerminalRule1793);
+ match(input,21,FOLLOW_21_in_ruleTerminalRule1794);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -1855,7 +1873,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1828);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1829);
lv_alternatives=ruleTerminalAlternatives();
_fsp--;
@@ -1878,7 +1896,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,22,FOLLOW_22_in_ruleTerminalRule1842);
+ match(input,22,FOLLOW_22_in_ruleTerminalRule1843);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.7/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -1916,12 +1934,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:872:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.8" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1877);
+ pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1878);
iv_ruleTypeRef=ruleTypeRef();
_fsp--;
current =iv_ruleTypeRef;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef1887);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef1888);
}
@@ -1953,17 +1971,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:884:2: ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:884:2: ( ( ( RULE_ID ) ) '::' )?
- int alt17=2;
- int LA17_0 = input.LA(1);
+ int alt18=2;
+ int LA18_0 = input.LA(1);
- if ( (LA17_0==RULE_ID) ) {
- int LA17_1 = input.LA(2);
+ if ( (LA18_0==RULE_ID) ) {
+ int LA18_1 = input.LA(2);
- if ( (LA17_1==28) ) {
- alt17=1;
+ if ( (LA18_1==28) ) {
+ alt18=1;
}
}
- switch (alt17) {
+ switch (alt18) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:884:3: ( ( RULE_ID ) ) '::'
{
@@ -1979,7 +1997,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:893:1: ( RULE_ID )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:894:2: RULE_ID
{
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1937);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1938);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::CrossReference */, "metamodel");
@@ -1989,7 +2007,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,28,FOLLOW_28_in_ruleTypeRef1950);
+ match(input,28,FOLLOW_28_in_ruleTypeRef1951);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -2011,7 +2029,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:912:1: ( RULE_ID )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:913:2: RULE_ID
{
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1976);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1977);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "type");
@@ -2055,12 +2073,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:928:2: iv_ruleAlternatives= ruleAlternatives EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.9" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives2015);
+ pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives2016);
iv_ruleAlternatives=ruleAlternatives();
_fsp--;
current =iv_ruleAlternatives;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAlternatives2025);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAlternatives2026);
}
@@ -2099,7 +2117,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives2072);
+ pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives2073);
this_Group=ruleGroup();
_fsp--;
@@ -2108,17 +2126,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:949:1: ( ( () '|' ) (lv_groups= ruleGroup ) )*
- loop18:
+ loop19:
do {
- int alt18=2;
- int LA18_0 = input.LA(1);
+ int alt19=2;
+ int LA19_0 = input.LA(1);
- if ( (LA18_0==29) ) {
- alt18=1;
+ if ( (LA19_0==29) ) {
+ alt19=1;
}
- switch (alt18) {
+ switch (alt19) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:949:2: ( () '|' ) (lv_groups= ruleGroup )
{
@@ -2146,7 +2164,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,29,FOLLOW_29_in_ruleAlternatives2091);
+ match(input,29,FOLLOW_29_in_ruleAlternatives2092);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -2159,7 +2177,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives2126);
+ pushFollow(FOLLOW_ruleGroup_in_ruleAlternatives2127);
lv_groups=ruleGroup();
_fsp--;
@@ -2184,7 +2202,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
break;
default :
- break loop18;
+ break loop19;
}
} while (true);
@@ -2222,12 +2240,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1000:2: iv_ruleTerminalAlternatives= ruleTerminalAlternatives EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.10" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2167);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2168);
iv_ruleTerminalAlternatives=ruleTerminalAlternatives();
_fsp--;
current =iv_ruleTerminalAlternatives;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalAlternatives2177);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalAlternatives2178);
}
@@ -2266,7 +2284,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2224);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2225);
this_TerminalGroup=ruleTerminalGroup();
_fsp--;
@@ -2275,17 +2293,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1021:1: ( ( () '|' ) (lv_groups= ruleTerminalGroup ) )*
- loop19:
+ loop20:
do {
- int alt19=2;
- int LA19_0 = input.LA(1);
+ int alt20=2;
+ int LA20_0 = input.LA(1);
- if ( (LA19_0==29) ) {
- alt19=1;
+ if ( (LA20_0==29) ) {
+ alt20=1;
}
- switch (alt19) {
+ switch (alt20) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1021:2: ( () '|' ) (lv_groups= ruleTerminalGroup )
{
@@ -2313,7 +2331,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,29,FOLLOW_29_in_ruleTerminalAlternatives2243);
+ match(input,29,FOLLOW_29_in_ruleTerminalAlternatives2244);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -2326,7 +2344,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2278);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2279);
lv_groups=ruleTerminalGroup();
_fsp--;
@@ -2351,7 +2369,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
break;
default :
- break loop19;
+ break loop20;
}
} while (true);
@@ -2389,12 +2407,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1072:2: iv_ruleGroup= ruleGroup EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.11" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup2319);
+ pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup2320);
iv_ruleGroup=ruleGroup();
_fsp--;
current =iv_ruleGroup;
- match(input,EOF,FOLLOW_EOF_in_entryRuleGroup2329);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleGroup2330);
}
@@ -2433,7 +2451,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.11/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2376);
+ pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2377);
this_AbstractToken=ruleAbstractToken();
_fsp--;
@@ -2442,17 +2460,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1093:1: ( () (lv_abstractTokens= ruleAbstractToken ) )*
- loop20:
+ loop21:
do {
- int alt20=2;
- int LA20_0 = input.LA(1);
+ int alt21=2;
+ int LA21_0 = input.LA(1);
- if ( ((LA20_0>=RULE_ID && LA20_0<=RULE_STRING)||LA20_0==24||LA20_0==36||LA20_0==42) ) {
- alt20=1;
+ if ( ((LA21_0>=RULE_ID && LA21_0<=RULE_STRING)||LA21_0==24||LA21_0==36||LA21_0==42) ) {
+ alt21=1;
}
- switch (alt20) {
+ switch (alt21) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1093:2: () (lv_abstractTokens= ruleAbstractToken )
{
@@ -2483,7 +2501,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.11/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2419);
+ pushFollow(FOLLOW_ruleAbstractToken_in_ruleGroup2420);
lv_abstractTokens=ruleAbstractToken();
_fsp--;
@@ -2508,7 +2526,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
break;
default :
- break loop20;
+ break loop21;
}
} while (true);
@@ -2546,12 +2564,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1140:2: iv_ruleTerminalGroup= ruleTerminalGroup EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.12" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2460);
+ pushFollow(FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2461);
iv_ruleTerminalGroup=ruleTerminalGroup();
_fsp--;
current =iv_ruleTerminalGroup;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalGroup2470);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalGroup2471);
}
@@ -2590,7 +2608,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2517);
+ pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2518);
this_TerminalToken=ruleTerminalToken();
_fsp--;
@@ -2599,17 +2617,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1161:1: ( () (lv_abstractTokens= ruleTerminalToken ) )*
- loop21:
+ loop22:
do {
- int alt21=2;
- int LA21_0 = input.LA(1);
+ int alt22=2;
+ int LA22_0 = input.LA(1);
- if ( ((LA21_0>=RULE_ID && LA21_0<=RULE_STRING)||LA21_0==13||LA21_0==24||(LA21_0>=39 && LA21_0<=40)) ) {
- alt21=1;
+ if ( ((LA22_0>=RULE_ID && LA22_0<=RULE_STRING)||LA22_0==13||LA22_0==24||(LA22_0>=39 && LA22_0<=40)) ) {
+ alt22=1;
}
- switch (alt21) {
+ switch (alt22) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1161:2: () (lv_abstractTokens= ruleTerminalToken )
{
@@ -2640,7 +2658,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2560);
+ pushFollow(FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2561);
lv_abstractTokens=ruleTerminalToken();
_fsp--;
@@ -2665,7 +2683,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
break;
default :
- break loop21;
+ break loop22;
}
} while (true);
@@ -2703,12 +2721,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1208:2: iv_ruleAbstractToken= ruleAbstractToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2601);
+ pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2602);
iv_ruleAbstractToken=ruleAbstractToken();
_fsp--;
current =iv_ruleAbstractToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractToken2611);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractToken2612);
}
@@ -2748,21 +2766,21 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )
- int alt23=2;
+ int alt24=2;
switch ( input.LA(1) ) {
case RULE_ID:
{
- int LA23_1 = input.LA(2);
+ int LA24_1 = input.LA(2);
- if ( (LA23_1==EOF||(LA23_1>=RULE_ID && LA23_1<=RULE_STRING)||LA23_1==22||LA23_1==24||LA23_1==26||(LA23_1>=29 && LA23_1<=32)||LA23_1==36||LA23_1==42) ) {
- alt23=2;
+ if ( ((LA24_1>=33 && LA24_1<=35)) ) {
+ alt24=1;
}
- else if ( ((LA23_1>=33 && LA23_1<=35)) ) {
- alt23=1;
+ else if ( (LA24_1==EOF||(LA24_1>=RULE_ID && LA24_1<=RULE_STRING)||LA24_1==22||LA24_1==24||LA24_1==26||(LA24_1>=29 && LA24_1<=32)||LA24_1==36||LA24_1==42) ) {
+ alt24=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 23, 1, input);
+ new NoViableAltException("1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 24, 1, input);
throw nvae;
}
@@ -2770,51 +2788,51 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
break;
case 36:
{
- alt23=1;
+ alt24=1;
}
break;
case RULE_STRING:
case 24:
case 42:
{
- alt23=2;
+ alt24=2;
}
break;
default:
NoViableAltException nvae =
- new NoViableAltException("1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 23, 0, input);
+ new NoViableAltException("1220:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 24, 0, input);
throw nvae;
}
- switch (alt23) {
+ switch (alt24) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1220:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1220:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
- int alt22=2;
- int LA22_0 = input.LA(1);
+ int alt23=2;
+ int LA23_0 = input.LA(1);
- if ( (LA22_0==RULE_ID) ) {
- alt22=1;
+ if ( (LA23_0==RULE_ID) ) {
+ alt23=1;
}
- else if ( (LA22_0==36) ) {
- alt22=2;
+ else if ( (LA23_0==36) ) {
+ alt23=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1220:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )", 22, 0, input);
+ new NoViableAltException("1220:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )", 23, 0, input);
throw nvae;
}
- switch (alt22) {
+ switch (alt23) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1221:5: this_Assignment= ruleAssignment
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAssignment_in_ruleAbstractToken2660);
+ pushFollow(FOLLOW_ruleAssignment_in_ruleAbstractToken2661);
this_Assignment=ruleAssignment();
_fsp--;
@@ -2831,7 +2849,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAction_in_ruleAbstractToken2687);
+ pushFollow(FOLLOW_ruleAction_in_ruleAbstractToken2688);
this_Action=ruleAction();
_fsp--;
@@ -2854,7 +2872,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2715);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2716);
this_AbstractTerminal=ruleAbstractTerminal();
_fsp--;
@@ -2869,57 +2887,57 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1249:2: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
- int alt26=2;
- int LA26_0 = input.LA(1);
+ int alt27=2;
+ int LA27_0 = input.LA(1);
- if ( ((LA26_0>=30 && LA26_0<=32)) ) {
- alt26=1;
+ if ( ((LA27_0>=30 && LA27_0<=32)) ) {
+ alt27=1;
}
- switch (alt26) {
+ switch (alt27) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1251:6: lv_cardinality= ( ( '?' | '*' ) | '+' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1251:21: ( ( '?' | '*' ) | '+' )
- int alt25=2;
- int LA25_0 = input.LA(1);
+ int alt26=2;
+ int LA26_0 = input.LA(1);
- if ( ((LA25_0>=30 && LA25_0<=31)) ) {
- alt25=1;
+ if ( ((LA26_0>=30 && LA26_0<=31)) ) {
+ alt26=1;
}
- else if ( (LA25_0==32) ) {
- alt25=2;
+ else if ( (LA26_0==32) ) {
+ alt26=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1251:21: ( ( '?' | '*' ) | '+' )", 25, 0, input);
+ new NoViableAltException("1251:21: ( ( '?' | '*' ) | '+' )", 26, 0, input);
throw nvae;
}
- switch (alt25) {
+ switch (alt26) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1251:22: ( '?' | '*' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1251:22: ( '?' | '*' )
- int alt24=2;
- int LA24_0 = input.LA(1);
+ int alt25=2;
+ int LA25_0 = input.LA(1);
- if ( (LA24_0==30) ) {
- alt24=1;
+ if ( (LA25_0==30) ) {
+ alt25=1;
}
- else if ( (LA24_0==31) ) {
- alt24=2;
+ else if ( (LA25_0==31) ) {
+ alt25=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1251:22: ( '?' | '*' )", 24, 0, input);
+ new NoViableAltException("1251:22: ( '?' | '*' )", 25, 0, input);
throw nvae;
}
- switch (alt24) {
+ switch (alt25) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1251:23: '?'
{
- match(input,30,FOLLOW_30_in_ruleAbstractToken2738);
+ match(input,30,FOLLOW_30_in_ruleAbstractToken2739);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.1/@terminal/@groups.0/@groups.0" /* xtext::Keyword */, "cardinality");
@@ -2929,7 +2947,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1256:6: '*'
{
- match(input,31,FOLLOW_31_in_ruleAbstractToken2753);
+ match(input,31,FOLLOW_31_in_ruleAbstractToken2754);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.1/@terminal/@groups.0/@groups.1" /* xtext::Keyword */, "cardinality");
@@ -2945,7 +2963,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1261:6: '+'
{
- match(input,32,FOLLOW_32_in_ruleAbstractToken2769);
+ match(input,32,FOLLOW_32_in_ruleAbstractToken2770);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.13/@alternatives/@abstractTokens.1/@terminal/@groups.1" /* xtext::Keyword */, "cardinality");
@@ -3007,12 +3025,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1289:2: iv_ruleTerminalToken= ruleTerminalToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.14" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2818);
+ pushFollow(FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2819);
iv_ruleTerminalToken=ruleTerminalToken();
_fsp--;
current =iv_ruleTerminalToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalToken2828);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalToken2829);
}
@@ -3050,7 +3068,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2875);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2876);
this_TerminalTokenElement=ruleTerminalTokenElement();
_fsp--;
@@ -3059,57 +3077,57 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1310:1: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
- int alt29=2;
- int LA29_0 = input.LA(1);
+ int alt30=2;
+ int LA30_0 = input.LA(1);
- if ( ((LA29_0>=30 && LA29_0<=32)) ) {
- alt29=1;
+ if ( ((LA30_0>=30 && LA30_0<=32)) ) {
+ alt30=1;
}
- switch (alt29) {
+ switch (alt30) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1312:6: lv_cardinality= ( ( '?' | '*' ) | '+' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1312:21: ( ( '?' | '*' ) | '+' )
- int alt28=2;
- int LA28_0 = input.LA(1);
+ int alt29=2;
+ int LA29_0 = input.LA(1);
- if ( ((LA28_0>=30 && LA28_0<=31)) ) {
- alt28=1;
+ if ( ((LA29_0>=30 && LA29_0<=31)) ) {
+ alt29=1;
}
- else if ( (LA28_0==32) ) {
- alt28=2;
+ else if ( (LA29_0==32) ) {
+ alt29=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1312:21: ( ( '?' | '*' ) | '+' )", 28, 0, input);
+ new NoViableAltException("1312:21: ( ( '?' | '*' ) | '+' )", 29, 0, input);
throw nvae;
}
- switch (alt28) {
+ switch (alt29) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1312:22: ( '?' | '*' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1312:22: ( '?' | '*' )
- int alt27=2;
- int LA27_0 = input.LA(1);
+ int alt28=2;
+ int LA28_0 = input.LA(1);
- if ( (LA27_0==30) ) {
- alt27=1;
+ if ( (LA28_0==30) ) {
+ alt28=1;
}
- else if ( (LA27_0==31) ) {
- alt27=2;
+ else if ( (LA28_0==31) ) {
+ alt28=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1312:22: ( '?' | '*' )", 27, 0, input);
+ new NoViableAltException("1312:22: ( '?' | '*' )", 28, 0, input);
throw nvae;
}
- switch (alt27) {
+ switch (alt28) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1312:23: '?'
{
- match(input,30,FOLLOW_30_in_ruleTerminalToken2897);
+ match(input,30,FOLLOW_30_in_ruleTerminalToken2898);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.1/@terminal/@groups.0/@groups.0" /* xtext::Keyword */, "cardinality");
@@ -3119,7 +3137,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1317:6: '*'
{
- match(input,31,FOLLOW_31_in_ruleTerminalToken2912);
+ match(input,31,FOLLOW_31_in_ruleTerminalToken2913);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.1/@terminal/@groups.0/@groups.1" /* xtext::Keyword */, "cardinality");
@@ -3135,7 +3153,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1322:6: '+'
{
- match(input,32,FOLLOW_32_in_ruleTerminalToken2928);
+ match(input,32,FOLLOW_32_in_ruleTerminalToken2929);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.1/@terminal/@groups.1" /* xtext::Keyword */, "cardinality");
@@ -3197,12 +3215,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1350:2: iv_ruleAssignment= ruleAssignment EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2977);
+ pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2978);
iv_ruleAssignment=ruleAssignment();
_fsp--;
current =iv_ruleAssignment;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAssignment2987);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAssignment2988);
}
@@ -3245,7 +3263,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1364:6: lv_feature= RULE_ID
{
lv_feature=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment3034);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment3035);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, "feature");
@@ -3268,46 +3286,46 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1384:6: lv_operator= ( ( '+=' | '=' ) | '?=' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1384:18: ( ( '+=' | '=' ) | '?=' )
- int alt31=2;
- int LA31_0 = input.LA(1);
+ int alt32=2;
+ int LA32_0 = input.LA(1);
- if ( ((LA31_0>=33 && LA31_0<=34)) ) {
- alt31=1;
+ if ( ((LA32_0>=33 && LA32_0<=34)) ) {
+ alt32=1;
}
- else if ( (LA31_0==35) ) {
- alt31=2;
+ else if ( (LA32_0==35) ) {
+ alt32=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1384:18: ( ( '+=' | '=' ) | '?=' )", 31, 0, input);
+ new NoViableAltException("1384:18: ( ( '+=' | '=' ) | '?=' )", 32, 0, input);
throw nvae;
}
- switch (alt31) {
+ switch (alt32) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1384:19: ( '+=' | '=' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1384:19: ( '+=' | '=' )
- int alt30=2;
- int LA30_0 = input.LA(1);
+ int alt31=2;
+ int LA31_0 = input.LA(1);
- if ( (LA30_0==33) ) {
- alt30=1;
+ if ( (LA31_0==33) ) {
+ alt31=1;
}
- else if ( (LA30_0==34) ) {
- alt30=2;
+ else if ( (LA31_0==34) ) {
+ alt31=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1384:19: ( '+=' | '=' )", 30, 0, input);
+ new NoViableAltException("1384:19: ( '+=' | '=' )", 31, 0, input);
throw nvae;
}
- switch (alt30) {
+ switch (alt31) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1384:20: '+='
{
- match(input,33,FOLLOW_33_in_ruleAssignment3068);
+ match(input,33,FOLLOW_33_in_ruleAssignment3069);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.0/@groups.0" /* xtext::Keyword */, "operator");
@@ -3317,7 +3335,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1389:6: '='
{
- match(input,34,FOLLOW_34_in_ruleAssignment3083);
+ match(input,34,FOLLOW_34_in_ruleAssignment3084);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.0/@groups.1" /* xtext::Keyword */, "operator");
@@ -3333,7 +3351,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1394:6: '?='
{
- match(input,35,FOLLOW_35_in_ruleAssignment3099);
+ match(input,35,FOLLOW_35_in_ruleAssignment3100);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.1" /* xtext::Keyword */, "operator");
@@ -3367,7 +3385,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.15/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAssignment3147);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_ruleAssignment3148);
lv_terminal=ruleAbstractTerminal();
_fsp--;
@@ -3421,12 +3439,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1443:2: iv_ruleAction= ruleAction EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAction_in_entryRuleAction3186);
+ pushFollow(FOLLOW_ruleAction_in_entryRuleAction3187);
iv_ruleAction=ruleAction();
_fsp--;
current =iv_ruleAction;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAction3196);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAction3197);
}
@@ -3480,26 +3498,26 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1455:7: ( '{' ( 'current' '=' )? )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1455:8: '{' ( 'current' '=' )?
{
- match(input,36,FOLLOW_36_in_ruleAction3236);
+ match(input,36,FOLLOW_36_in_ruleAction3237);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1459:1: ( 'current' '=' )?
- int alt32=2;
- int LA32_0 = input.LA(1);
+ int alt33=2;
+ int LA33_0 = input.LA(1);
- if ( (LA32_0==37) ) {
- alt32=1;
+ if ( (LA33_0==37) ) {
+ alt33=1;
}
- switch (alt32) {
+ switch (alt33) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1459:2: 'current' '='
{
- match(input,37,FOLLOW_37_in_ruleAction3246);
+ match(input,37,FOLLOW_37_in_ruleAction3247);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- match(input,34,FOLLOW_34_in_ruleAction3255);
+ match(input,34,FOLLOW_34_in_ruleAction3256);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -3518,7 +3536,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleAction3292);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleAction3293);
lv_typeName=ruleTypeRef();
_fsp--;
@@ -3541,7 +3559,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,13,FOLLOW_13_in_ruleAction3306);
+ match(input,13,FOLLOW_13_in_ruleAction3307);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -3552,7 +3570,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1494:6: lv_feature= RULE_ID
{
lv_feature=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction3328);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction3329);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "feature");
@@ -3578,26 +3596,26 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1514:6: lv_operator= ( '=' | '+=' )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1514:18: ( '=' | '+=' )
- int alt33=2;
- int LA33_0 = input.LA(1);
+ int alt34=2;
+ int LA34_0 = input.LA(1);
- if ( (LA33_0==34) ) {
- alt33=1;
+ if ( (LA34_0==34) ) {
+ alt34=1;
}
- else if ( (LA33_0==33) ) {
- alt33=2;
+ else if ( (LA34_0==33) ) {
+ alt34=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1514:18: ( '=' | '+=' )", 33, 0, input);
+ new NoViableAltException("1514:18: ( '=' | '+=' )", 34, 0, input);
throw nvae;
}
- switch (alt33) {
+ switch (alt34) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1514:19: '='
{
- match(input,34,FOLLOW_34_in_ruleAction3362);
+ match(input,34,FOLLOW_34_in_ruleAction3363);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.0" /* xtext::Keyword */, "operator");
@@ -3607,7 +3625,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
case 2 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1519:6: '+='
{
- match(input,33,FOLLOW_33_in_ruleAction3377);
+ match(input,33,FOLLOW_33_in_ruleAction3378);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.1" /* xtext::Keyword */, "operator");
@@ -3635,14 +3653,14 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,37,FOLLOW_37_in_ruleAction3400);
+ match(input,37,FOLLOW_37_in_ruleAction3401);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
}
- match(input,38,FOLLOW_38_in_ruleAction3410);
+ match(input,38,FOLLOW_38_in_ruleAction3411);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.16/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -3680,12 +3698,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1555:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.17" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3445);
+ pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3446);
iv_ruleAbstractTerminal=ruleAbstractTerminal();
_fsp--;
current =iv_ruleAbstractTerminal;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractTerminal3455);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractTerminal3456);
}
@@ -3723,69 +3741,69 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
- int alt36=2;
- int LA36_0 = input.LA(1);
+ int alt37=2;
+ int LA37_0 = input.LA(1);
- if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)||LA36_0==24) ) {
- alt36=1;
+ if ( ((LA37_0>=RULE_ID && LA37_0<=RULE_STRING)||LA37_0==24) ) {
+ alt37=1;
}
- else if ( (LA36_0==42) ) {
- alt36=2;
+ else if ( (LA37_0==42) ) {
+ alt37=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1567:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )", 36, 0, input);
+ new NoViableAltException("1567:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )", 37, 0, input);
throw nvae;
}
- switch (alt36) {
+ switch (alt37) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
- int alt35=2;
- int LA35_0 = input.LA(1);
+ int alt36=2;
+ int LA36_0 = input.LA(1);
- if ( ((LA35_0>=RULE_ID && LA35_0<=RULE_STRING)) ) {
- alt35=1;
+ if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)) ) {
+ alt36=1;
}
- else if ( (LA35_0==24) ) {
- alt35=2;
+ else if ( (LA36_0==24) ) {
+ alt36=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1567:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )", 35, 0, input);
+ new NoViableAltException("1567:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )", 36, 0, input);
throw nvae;
}
- switch (alt35) {
+ switch (alt36) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1567:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
- int alt34=2;
- int LA34_0 = input.LA(1);
+ int alt35=2;
+ int LA35_0 = input.LA(1);
- if ( (LA34_0==RULE_STRING) ) {
- alt34=1;
+ if ( (LA35_0==RULE_STRING) ) {
+ alt35=1;
}
- else if ( (LA34_0==RULE_ID) ) {
- alt34=2;
+ else if ( (LA35_0==RULE_ID) ) {
+ alt35=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1567:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )", 34, 0, input);
+ new NoViableAltException("1567:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )", 35, 0, input);
throw nvae;
}
- switch (alt34) {
+ switch (alt35) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1568:5: this_Keyword= ruleKeyword
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.17/@alternatives/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleAbstractTerminal3504);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleAbstractTerminal3505);
this_Keyword=ruleKeyword();
_fsp--;
@@ -3802,7 +3820,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.17/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3531);
+ pushFollow(FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3532);
this_RuleCall=ruleRuleCall();
_fsp--;
@@ -3825,7 +3843,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.17/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3559);
+ pushFollow(FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3560);
this_ParenthesizedElement=ruleParenthesizedElement();
_fsp--;
@@ -3848,7 +3866,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.17/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3587);
+ pushFollow(FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3588);
this_CrossReference=ruleCrossReference();
_fsp--;
@@ -3893,12 +3911,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1616:2: iv_ruleTerminalTokenElement= ruleTerminalTokenElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3621);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3622);
iv_ruleTerminalTokenElement=ruleTerminalTokenElement();
_fsp--;
current =iv_ruleTerminalTokenElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalTokenElement3631);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleTerminalTokenElement3632);
}
@@ -3938,89 +3956,89 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:1: ( ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken ) | this_Wildcard= ruleWildcard )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:1: ( ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken ) | this_Wildcard= ruleWildcard )
- int alt40=2;
- int LA40_0 = input.LA(1);
+ int alt41=2;
+ int LA41_0 = input.LA(1);
- if ( ((LA40_0>=RULE_ID && LA40_0<=RULE_STRING)||LA40_0==24||(LA40_0>=39 && LA40_0<=40)) ) {
- alt40=1;
+ if ( ((LA41_0>=RULE_ID && LA41_0<=RULE_STRING)||LA41_0==24||(LA41_0>=39 && LA41_0<=40)) ) {
+ alt41=1;
}
- else if ( (LA40_0==13) ) {
- alt40=2;
+ else if ( (LA41_0==13) ) {
+ alt41=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1628:1: ( ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken ) | this_Wildcard= ruleWildcard )", 40, 0, input);
+ new NoViableAltException("1628:1: ( ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken ) | this_Wildcard= ruleWildcard )", 41, 0, input);
throw nvae;
}
- switch (alt40) {
+ switch (alt41) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:2: ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:2: ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken )
- int alt39=2;
- int LA39_0 = input.LA(1);
+ int alt40=2;
+ int LA40_0 = input.LA(1);
- if ( ((LA39_0>=RULE_ID && LA39_0<=RULE_STRING)||LA39_0==24) ) {
- alt39=1;
+ if ( ((LA40_0>=RULE_ID && LA40_0<=RULE_STRING)||LA40_0==24) ) {
+ alt40=1;
}
- else if ( ((LA39_0>=39 && LA39_0<=40)) ) {
- alt39=2;
+ else if ( ((LA40_0>=39 && LA40_0<=40)) ) {
+ alt40=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1628:2: ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken )", 39, 0, input);
+ new NoViableAltException("1628:2: ( ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement ) | this_AbstractNegatedToken= ruleAbstractNegatedToken )", 40, 0, input);
throw nvae;
}
- switch (alt39) {
+ switch (alt40) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:3: ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:3: ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement )
- int alt38=2;
- int LA38_0 = input.LA(1);
+ int alt39=2;
+ int LA39_0 = input.LA(1);
- if ( ((LA38_0>=RULE_ID && LA38_0<=RULE_STRING)) ) {
- alt38=1;
+ if ( ((LA39_0>=RULE_ID && LA39_0<=RULE_STRING)) ) {
+ alt39=1;
}
- else if ( (LA38_0==24) ) {
- alt38=2;
+ else if ( (LA39_0==24) ) {
+ alt39=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1628:3: ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement )", 38, 0, input);
+ new NoViableAltException("1628:3: ( (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall ) | this_ParenthesizedTerminalElement= ruleParenthesizedTerminalElement )", 39, 0, input);
throw nvae;
}
- switch (alt38) {
+ switch (alt39) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:4: (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1628:4: (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall )
- int alt37=2;
- int LA37_0 = input.LA(1);
+ int alt38=2;
+ int LA38_0 = input.LA(1);
- if ( (LA37_0==RULE_STRING) ) {
- alt37=1;
+ if ( (LA38_0==RULE_STRING) ) {
+ alt38=1;
}
- else if ( (LA37_0==RULE_ID) ) {
- alt37=2;
+ else if ( (LA38_0==RULE_ID) ) {
+ alt38=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1628:4: (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall )", 37, 0, input);
+ new NoViableAltException("1628:4: (this_CharacterRange= ruleCharacterRange | this_RuleCall= ruleRuleCall )", 38, 0, input);
throw nvae;
}
- switch (alt37) {
+ switch (alt38) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1629:5: this_CharacterRange= ruleCharacterRange
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18/@alternatives/@groups.0/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3681);
+ pushFollow(FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3682);
this_CharacterRange=ruleCharacterRange();
_fsp--;
@@ -4037,7 +4055,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18/@alternatives/@groups.0/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3708);
+ pushFollow(FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3709);
this_RuleCall=ruleRuleCall();
_fsp--;
@@ -4060,7 +4078,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3736);
+ pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3737);
this_ParenthesizedTerminalElement=ruleParenthesizedTerminalElement();
_fsp--;
@@ -4083,7 +4101,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3764);
+ pushFollow(FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3765);
this_AbstractNegatedToken=ruleAbstractNegatedToken();
_fsp--;
@@ -4106,7 +4124,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.18/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3792);
+ pushFollow(FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3793);
this_Wildcard=ruleWildcard();
_fsp--;
@@ -4151,12 +4169,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1687:2: iv_ruleAbstractNegatedToken= ruleAbstractNegatedToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.19" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3826);
+ pushFollow(FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3827);
iv_ruleAbstractNegatedToken=ruleAbstractNegatedToken();
_fsp--;
current =iv_ruleAbstractNegatedToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractNegatedToken3836);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbstractNegatedToken3837);
}
@@ -4190,29 +4208,29 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1699:1: (this_NegatedToken= ruleNegatedToken | this_UpToToken= ruleUpToToken )
{
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1699:1: (this_NegatedToken= ruleNegatedToken | this_UpToToken= ruleUpToToken )
- int alt41=2;
- int LA41_0 = input.LA(1);
+ int alt42=2;
+ int LA42_0 = input.LA(1);
- if ( (LA41_0==39) ) {
- alt41=1;
+ if ( (LA42_0==39) ) {
+ alt42=1;
}
- else if ( (LA41_0==40) ) {
- alt41=2;
+ else if ( (LA42_0==40) ) {
+ alt42=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("1699:1: (this_NegatedToken= ruleNegatedToken | this_UpToToken= ruleUpToToken )", 41, 0, input);
+ new NoViableAltException("1699:1: (this_NegatedToken= ruleNegatedToken | this_UpToToken= ruleUpToToken )", 42, 0, input);
throw nvae;
}
- switch (alt41) {
+ switch (alt42) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1700:5: this_NegatedToken= ruleNegatedToken
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.19/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3883);
+ pushFollow(FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3884);
this_NegatedToken=ruleNegatedToken();
_fsp--;
@@ -4229,7 +4247,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.19/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3910);
+ pushFollow(FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3911);
this_UpToToken=ruleUpToToken();
_fsp--;
@@ -4274,12 +4292,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1728:2: iv_ruleNegatedToken= ruleNegatedToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.20" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3944);
+ pushFollow(FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3945);
iv_ruleNegatedToken=ruleNegatedToken();
_fsp--;
current =iv_ruleNegatedToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleNegatedToken3954);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleNegatedToken3955);
}
@@ -4313,7 +4331,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1740:1: ( '!' (lv_terminal= ruleTerminalTokenElement ) )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1740:2: '!' (lv_terminal= ruleTerminalTokenElement )
{
- match(input,39,FOLLOW_39_in_ruleNegatedToken3988);
+ match(input,39,FOLLOW_39_in_ruleNegatedToken3989);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.20/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null);
@@ -4323,7 +4341,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.20/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4022);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4023);
lv_terminal=ruleTerminalTokenElement();
_fsp--;
@@ -4377,12 +4395,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1775:2: iv_ruleUpToToken= ruleUpToToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.21" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4061);
+ pushFollow(FOLLOW_ruleUpToToken_in_entryRuleUpToToken4062);
iv_ruleUpToToken=ruleUpToToken();
_fsp--;
current =iv_ruleUpToToken;
- match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4071);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleUpToToken4072);
}
@@ -4416,7 +4434,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1787:1: ( '->' (lv_terminal= ruleTerminalTokenElement ) )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1787:2: '->' (lv_terminal= ruleTerminalTokenElement )
{
- match(input,40,FOLLOW_40_in_ruleUpToToken4105);
+ match(input,40,FOLLOW_40_in_ruleUpToToken4106);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.21/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null);
@@ -4426,7 +4444,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.21/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4139);
+ pushFollow(FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4140);
lv_terminal=ruleTerminalTokenElement();
_fsp--;
@@ -4480,12 +4498,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1822:2: iv_ruleWildcard= ruleWildcard EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.22" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleWildcard_in_entryRuleWildcard4178);
+ pushFollow(FOLLOW_ruleWildcard_in_entryRuleWildcard4179);
iv_ruleWildcard=ruleWildcard();
_fsp--;
current =iv_ruleWildcard;
- match(input,EOF,FOLLOW_EOF_in_entryRuleWildcard4188);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleWildcard4189);
}
@@ -4519,7 +4537,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1836:6: lv_isWildcard= '.'
{
lv_isWildcard=(Token)input.LT(1);
- match(input,13,FOLLOW_13_in_ruleWildcard4233);
+ match(input,13,FOLLOW_13_in_ruleWildcard4234);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.22/@alternatives/@terminal" /* xtext::Keyword */, "isWildcard");
@@ -4569,12 +4587,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1864:2: iv_ruleCharacterRange= ruleCharacterRange EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.23" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4279);
+ pushFollow(FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4280);
iv_ruleCharacterRange=ruleCharacterRange();
_fsp--;
current =iv_ruleCharacterRange;
- match(input,EOF,FOLLOW_EOF_in_entryRuleCharacterRange4289);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleCharacterRange4290);
}
@@ -4613,7 +4631,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.23/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4336);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4337);
this_Keyword=ruleKeyword();
_fsp--;
@@ -4622,13 +4640,13 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode = currentNode.getParent();
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1885:1: ( ( () '..' ) (lv_right= ruleKeyword ) )?
- int alt42=2;
- int LA42_0 = input.LA(1);
+ int alt43=2;
+ int LA43_0 = input.LA(1);
- if ( (LA42_0==41) ) {
- alt42=1;
+ if ( (LA43_0==41) ) {
+ alt43=1;
}
- switch (alt42) {
+ switch (alt43) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1885:2: ( () '..' ) (lv_right= ruleKeyword )
{
@@ -4656,7 +4674,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,41,FOLLOW_41_in_ruleCharacterRange4355);
+ match(input,41,FOLLOW_41_in_ruleCharacterRange4356);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.23/@alternatives/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -4669,7 +4687,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.23/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4390);
+ pushFollow(FOLLOW_ruleKeyword_in_ruleCharacterRange4391);
lv_right=ruleKeyword();
_fsp--;
@@ -4729,12 +4747,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1936:2: iv_ruleCrossReference= ruleCrossReference EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference4431);
+ pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference4432);
iv_ruleCrossReference=ruleCrossReference();
_fsp--;
current =iv_ruleCrossReference;
- match(input,EOF,FOLLOW_EOF_in_entryRuleCrossReference4441);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleCrossReference4442);
}
@@ -4774,7 +4792,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1948:3: ( '[' (lv_type= ruleTypeRef ) )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1948:4: '[' (lv_type= ruleTypeRef )
{
- match(input,42,FOLLOW_42_in_ruleCrossReference4477);
+ match(input,42,FOLLOW_42_in_ruleCrossReference4478);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
@@ -4784,7 +4802,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTypeRef_in_ruleCrossReference4511);
+ pushFollow(FOLLOW_ruleTypeRef_in_ruleCrossReference4512);
lv_type=ruleTypeRef();
_fsp--;
@@ -4808,17 +4826,17 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1973:3: ( '|' ( ( RULE_ID ) ) )?
- int alt43=2;
- int LA43_0 = input.LA(1);
+ int alt44=2;
+ int LA44_0 = input.LA(1);
- if ( (LA43_0==29) ) {
- alt43=1;
+ if ( (LA44_0==29) ) {
+ alt44=1;
}
- switch (alt43) {
+ switch (alt44) {
case 1 :
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1973:4: '|' ( ( RULE_ID ) )
{
- match(input,29,FOLLOW_29_in_ruleCrossReference4526);
+ match(input,29,FOLLOW_29_in_ruleCrossReference4527);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
@@ -4834,7 +4852,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1986:1: ( RULE_ID )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:1987:2: RULE_ID
{
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference4550);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference4551);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "rule");
@@ -4853,7 +4871,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,43,FOLLOW_43_in_ruleCrossReference4566);
+ match(input,43,FOLLOW_43_in_ruleCrossReference4567);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.24/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -4891,12 +4909,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2006:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.25" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4601);
+ pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4602);
iv_ruleParenthesizedElement=ruleParenthesizedElement();
_fsp--;
current =iv_ruleParenthesizedElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement4611);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedElement4612);
}
@@ -4933,14 +4951,14 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2018:2: ( '(' this_Alternatives= ruleAlternatives )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2018:3: '(' this_Alternatives= ruleAlternatives
{
- match(input,24,FOLLOW_24_in_ruleParenthesizedElement4646);
+ match(input,24,FOLLOW_24_in_ruleParenthesizedElement4647);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.25/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.25/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4668);
+ pushFollow(FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4669);
this_Alternatives=ruleAlternatives();
_fsp--;
@@ -4951,7 +4969,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,26,FOLLOW_26_in_ruleParenthesizedElement4677);
+ match(input,26,FOLLOW_26_in_ruleParenthesizedElement4678);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.25/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -4989,12 +5007,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2045:2: iv_ruleParenthesizedTerminalElement= ruleParenthesizedTerminalElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.26" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4712);
+ pushFollow(FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4713);
iv_ruleParenthesizedTerminalElement=ruleParenthesizedTerminalElement();
_fsp--;
current =iv_ruleParenthesizedTerminalElement;
- match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4722);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4723);
}
@@ -5031,14 +5049,14 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2057:2: ( '(' this_TerminalAlternatives= ruleTerminalAlternatives )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2057:3: '(' this_TerminalAlternatives= ruleTerminalAlternatives
{
- match(input,24,FOLLOW_24_in_ruleParenthesizedTerminalElement4757);
+ match(input,24,FOLLOW_24_in_ruleParenthesizedTerminalElement4758);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.26/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.26/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, currentNode);
- pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4779);
+ pushFollow(FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4780);
this_TerminalAlternatives=ruleTerminalAlternatives();
_fsp--;
@@ -5049,7 +5067,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
}
- match(input,26,FOLLOW_26_in_ruleParenthesizedTerminalElement4788);
+ match(input,26,FOLLOW_26_in_ruleParenthesizedTerminalElement4789);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.26/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null);
@@ -5087,12 +5105,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2084:2: iv_ruleKeyword= ruleKeyword EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.27" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword4823);
+ pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword4824);
iv_ruleKeyword=ruleKeyword();
_fsp--;
current =iv_ruleKeyword;
- match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword4833);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword4834);
}
@@ -5126,7 +5144,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2098:6: lv_value= RULE_STRING
{
lv_value=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword4878);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword4879);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.27/@alternatives/@terminal" /* xtext::RuleCall */, "value");
@@ -5176,12 +5194,12 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2126:2: iv_ruleRuleCall= ruleRuleCall EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.28" /* xtext::ParserRule */, currentNode);
- pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall4923);
+ pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall4924);
iv_ruleRuleCall=ruleRuleCall();
_fsp--;
current =iv_ruleRuleCall;
- match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall4933);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleRuleCall4934);
}
@@ -5221,7 +5239,7 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2147:1: ( RULE_ID )
// ../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g:2148:2: RULE_ID
{
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall4981);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall4982);
createLeafNode("classpath:/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.xmi#//@rules.28/@alternatives/@terminal" /* xtext::CrossReference */, "rule");
@@ -5303,133 +5321,133 @@ public class InternalXtextTerminalsTestLanguageParser extends AbstractInternalAn
public static final BitSet FOLLOW_ruleTypeRef_in_ruleParserRule1400 = new BitSet(new long[]{0x0000000000A00000L});
public static final BitSet FOLLOW_23_in_ruleParserRule1432 = new BitSet(new long[]{0x0000000001000000L});
public static final BitSet FOLLOW_24_in_ruleParserRule1453 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1478 = new BitSet(new long[]{0x0000000002000000L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1478 = new BitSet(new long[]{0x0000000006000000L});
public static final BitSet FOLLOW_25_in_ruleParserRule1493 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1517 = new BitSet(new long[]{0x0000000004000000L});
- public static final BitSet FOLLOW_26_in_ruleParserRule1532 = new BitSet(new long[]{0x0000000000200000L});
- public static final BitSet FOLLOW_21_in_ruleParserRule1544 = new BitSet(new long[]{0x0000041001000030L});
- public static final BitSet FOLLOW_ruleAlternatives_in_ruleParserRule1579 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleParserRule1593 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1628 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalRule1638 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_27_in_ruleTerminalRule1688 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTerminalRule1721 = new BitSet(new long[]{0x0000000000300000L});
- public static final BitSet FOLLOW_20_in_ruleTerminalRule1743 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleTerminalRule1777 = new BitSet(new long[]{0x0000000000200000L});
- public static final BitSet FOLLOW_21_in_ruleTerminalRule1793 = new BitSet(new long[]{0x0000018001002030L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1828 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleTerminalRule1842 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef1877 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef1887 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1937 = new BitSet(new long[]{0x0000000010000000L});
- public static final BitSet FOLLOW_28_in_ruleTypeRef1950 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1976 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAlternatives_in_entryRuleAlternatives2015 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAlternatives2025 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives2072 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_29_in_ruleAlternatives2091 = new BitSet(new long[]{0x0000041001000030L});
- public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives2126 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2167 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalAlternatives2177 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2224 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_29_in_ruleTerminalAlternatives2243 = new BitSet(new long[]{0x0000018001002030L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2278 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_ruleGroup_in_entryRuleGroup2319 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGroup2329 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2376 = new BitSet(new long[]{0x0000041001000032L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2419 = new BitSet(new long[]{0x0000041001000032L});
- public static final BitSet FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2460 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalGroup2470 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2517 = new BitSet(new long[]{0x0000018001002032L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2560 = new BitSet(new long[]{0x0000018001002032L});
- public static final BitSet FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2601 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractToken2611 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAssignment_in_ruleAbstractToken2660 = new BitSet(new long[]{0x00000001C0000002L});
- public static final BitSet FOLLOW_ruleAction_in_ruleAbstractToken2687 = new BitSet(new long[]{0x00000001C0000002L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2715 = new BitSet(new long[]{0x00000001C0000002L});
- public static final BitSet FOLLOW_30_in_ruleAbstractToken2738 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_31_in_ruleAbstractToken2753 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_32_in_ruleAbstractToken2769 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2818 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalToken2828 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2875 = new BitSet(new long[]{0x00000001C0000002L});
- public static final BitSet FOLLOW_30_in_ruleTerminalToken2897 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_31_in_ruleTerminalToken2912 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_32_in_ruleTerminalToken2928 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAssignment_in_entryRuleAssignment2977 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAssignment2987 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAssignment3034 = new BitSet(new long[]{0x0000000E00000000L});
- public static final BitSet FOLLOW_33_in_ruleAssignment3068 = new BitSet(new long[]{0x0000040001000030L});
- public static final BitSet FOLLOW_34_in_ruleAssignment3083 = new BitSet(new long[]{0x0000040001000030L});
- public static final BitSet FOLLOW_35_in_ruleAssignment3099 = new BitSet(new long[]{0x0000040001000030L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAssignment3147 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAction_in_entryRuleAction3186 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAction3196 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_36_in_ruleAction3236 = new BitSet(new long[]{0x0000002000000010L});
- public static final BitSet FOLLOW_37_in_ruleAction3246 = new BitSet(new long[]{0x0000000400000000L});
- public static final BitSet FOLLOW_34_in_ruleAction3255 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleAction3292 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_13_in_ruleAction3306 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleAction3328 = new BitSet(new long[]{0x0000000600000000L});
- public static final BitSet FOLLOW_34_in_ruleAction3362 = new BitSet(new long[]{0x0000002000000000L});
- public static final BitSet FOLLOW_33_in_ruleAction3377 = new BitSet(new long[]{0x0000002000000000L});
- public static final BitSet FOLLOW_37_in_ruleAction3400 = new BitSet(new long[]{0x0000004000000000L});
- public static final BitSet FOLLOW_38_in_ruleAction3410 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3445 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractTerminal3455 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleAbstractTerminal3504 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3531 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3559 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3587 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3621 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleTerminalTokenElement3631 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3681 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3708 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3736 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3764 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3792 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3826 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3836 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3883 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3910 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3944 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3954 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_39_in_ruleNegatedToken3988 = new BitSet(new long[]{0x0000018001002030L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4022 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4061 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4071 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_40_in_ruleUpToToken4105 = new BitSet(new long[]{0x0000018001002030L});
- public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4139 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4178 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4188 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_ruleWildcard4233 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4279 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleCharacterRange4289 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4336 = new BitSet(new long[]{0x0000020000000002L});
- public static final BitSet FOLLOW_41_in_ruleCharacterRange4355 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4390 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleCrossReference_in_entryRuleCrossReference4431 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleCrossReference4441 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_42_in_ruleCrossReference4477 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleTypeRef_in_ruleCrossReference4511 = new BitSet(new long[]{0x0000080020000000L});
- public static final BitSet FOLLOW_29_in_ruleCrossReference4526 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleCrossReference4550 = new BitSet(new long[]{0x0000080000000000L});
- public static final BitSet FOLLOW_43_in_ruleCrossReference4566 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4601 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement4611 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_ruleParenthesizedElement4646 = new BitSet(new long[]{0x0000041001000030L});
- public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4668 = new BitSet(new long[]{0x0000000004000000L});
- public static final BitSet FOLLOW_26_in_ruleParenthesizedElement4677 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4712 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4722 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_ruleParenthesizedTerminalElement4757 = new BitSet(new long[]{0x0000018001002030L});
- public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4779 = new BitSet(new long[]{0x0000000004000000L});
- public static final BitSet FOLLOW_26_in_ruleParenthesizedTerminalElement4788 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword4823 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleKeyword4833 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword4878 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall4923 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall4933 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall4981 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleParserRule1517 = new BitSet(new long[]{0x0000000006000000L});
+ public static final BitSet FOLLOW_26_in_ruleParserRule1533 = new BitSet(new long[]{0x0000000000200000L});
+ public static final BitSet FOLLOW_21_in_ruleParserRule1545 = new BitSet(new long[]{0x0000041001000030L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_ruleParserRule1580 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleParserRule1594 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalRule_in_entryRuleTerminalRule1629 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalRule1639 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_27_in_ruleTerminalRule1689 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTerminalRule1722 = new BitSet(new long[]{0x0000000000300000L});
+ public static final BitSet FOLLOW_20_in_ruleTerminalRule1744 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleTerminalRule1778 = new BitSet(new long[]{0x0000000000200000L});
+ public static final BitSet FOLLOW_21_in_ruleTerminalRule1794 = new BitSet(new long[]{0x0000018001002030L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleTerminalRule1829 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleTerminalRule1843 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef1878 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef1888 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1938 = new BitSet(new long[]{0x0000000010000000L});
+ public static final BitSet FOLLOW_28_in_ruleTypeRef1951 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef1977 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_entryRuleAlternatives2016 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAlternatives2026 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives2073 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_29_in_ruleAlternatives2092 = new BitSet(new long[]{0x0000041001000030L});
+ public static final BitSet FOLLOW_ruleGroup_in_ruleAlternatives2127 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_entryRuleTerminalAlternatives2168 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalAlternatives2178 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2225 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_29_in_ruleTerminalAlternatives2244 = new BitSet(new long[]{0x0000018001002030L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_ruleTerminalAlternatives2279 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_ruleGroup_in_entryRuleGroup2320 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleGroup2330 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2377 = new BitSet(new long[]{0x0000041001000032L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_ruleGroup2420 = new BitSet(new long[]{0x0000041001000032L});
+ public static final BitSet FOLLOW_ruleTerminalGroup_in_entryRuleTerminalGroup2461 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalGroup2471 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2518 = new BitSet(new long[]{0x0000018001002032L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_ruleTerminalGroup2561 = new BitSet(new long[]{0x0000018001002032L});
+ public static final BitSet FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken2602 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractToken2612 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAssignment_in_ruleAbstractToken2661 = new BitSet(new long[]{0x00000001C0000002L});
+ public static final BitSet FOLLOW_ruleAction_in_ruleAbstractToken2688 = new BitSet(new long[]{0x00000001C0000002L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAbstractToken2716 = new BitSet(new long[]{0x00000001C0000002L});
+ public static final BitSet FOLLOW_30_in_ruleAbstractToken2739 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_31_in_ruleAbstractToken2754 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_32_in_ruleAbstractToken2770 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalToken_in_entryRuleTerminalToken2819 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalToken2829 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleTerminalToken2876 = new BitSet(new long[]{0x00000001C0000002L});
+ public static final BitSet FOLLOW_30_in_ruleTerminalToken2898 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_31_in_ruleTerminalToken2913 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_32_in_ruleTerminalToken2929 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAssignment_in_entryRuleAssignment2978 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAssignment2988 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAssignment3035 = new BitSet(new long[]{0x0000000E00000000L});
+ public static final BitSet FOLLOW_33_in_ruleAssignment3069 = new BitSet(new long[]{0x0000040001000030L});
+ public static final BitSet FOLLOW_34_in_ruleAssignment3084 = new BitSet(new long[]{0x0000040001000030L});
+ public static final BitSet FOLLOW_35_in_ruleAssignment3100 = new BitSet(new long[]{0x0000040001000030L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_ruleAssignment3148 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAction_in_entryRuleAction3187 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAction3197 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_36_in_ruleAction3237 = new BitSet(new long[]{0x0000002000000010L});
+ public static final BitSet FOLLOW_37_in_ruleAction3247 = new BitSet(new long[]{0x0000000400000000L});
+ public static final BitSet FOLLOW_34_in_ruleAction3256 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleAction3293 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_13_in_ruleAction3307 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleAction3329 = new BitSet(new long[]{0x0000000600000000L});
+ public static final BitSet FOLLOW_34_in_ruleAction3363 = new BitSet(new long[]{0x0000002000000000L});
+ public static final BitSet FOLLOW_33_in_ruleAction3378 = new BitSet(new long[]{0x0000002000000000L});
+ public static final BitSet FOLLOW_37_in_ruleAction3401 = new BitSet(new long[]{0x0000004000000000L});
+ public static final BitSet FOLLOW_38_in_ruleAction3411 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal3446 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractTerminal3456 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleAbstractTerminal3505 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_ruleAbstractTerminal3532 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedElement_in_ruleAbstractTerminal3560 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCrossReference_in_ruleAbstractTerminal3588 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_entryRuleTerminalTokenElement3622 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleTerminalTokenElement3632 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCharacterRange_in_ruleTerminalTokenElement3682 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_ruleTerminalTokenElement3709 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_ruleTerminalTokenElement3737 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_ruleTerminalTokenElement3765 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleWildcard_in_ruleTerminalTokenElement3793 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAbstractNegatedToken_in_entryRuleAbstractNegatedToken3827 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAbstractNegatedToken3837 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNegatedToken_in_ruleAbstractNegatedToken3884 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleUpToToken_in_ruleAbstractNegatedToken3911 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNegatedToken_in_entryRuleNegatedToken3945 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleNegatedToken3955 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_39_in_ruleNegatedToken3989 = new BitSet(new long[]{0x0000018001002030L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleNegatedToken4023 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleUpToToken_in_entryRuleUpToToken4062 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleUpToToken4072 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_40_in_ruleUpToToken4106 = new BitSet(new long[]{0x0000018001002030L});
+ public static final BitSet FOLLOW_ruleTerminalTokenElement_in_ruleUpToToken4140 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleWildcard_in_entryRuleWildcard4179 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleWildcard4189 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_13_in_ruleWildcard4234 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCharacterRange_in_entryRuleCharacterRange4280 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleCharacterRange4290 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4337 = new BitSet(new long[]{0x0000020000000002L});
+ public static final BitSet FOLLOW_41_in_ruleCharacterRange4356 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_ruleKeyword_in_ruleCharacterRange4391 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleCrossReference_in_entryRuleCrossReference4432 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleCrossReference4442 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_42_in_ruleCrossReference4478 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleTypeRef_in_ruleCrossReference4512 = new BitSet(new long[]{0x0000080020000000L});
+ public static final BitSet FOLLOW_29_in_ruleCrossReference4527 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleCrossReference4551 = new BitSet(new long[]{0x0000080000000000L});
+ public static final BitSet FOLLOW_43_in_ruleCrossReference4567 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement4602 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedElement4612 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_ruleParenthesizedElement4647 = new BitSet(new long[]{0x0000041001000030L});
+ public static final BitSet FOLLOW_ruleAlternatives_in_ruleParenthesizedElement4669 = new BitSet(new long[]{0x0000000004000000L});
+ public static final BitSet FOLLOW_26_in_ruleParenthesizedElement4678 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleParenthesizedTerminalElement_in_entryRuleParenthesizedTerminalElement4713 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleParenthesizedTerminalElement4723 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_ruleParenthesizedTerminalElement4758 = new BitSet(new long[]{0x0000018001002030L});
+ public static final BitSet FOLLOW_ruleTerminalAlternatives_in_ruleParenthesizedTerminalElement4780 = new BitSet(new long[]{0x0000000004000000L});
+ public static final BitSet FOLLOW_26_in_ruleParenthesizedTerminalElement4789 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword4824 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleKeyword4834 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword4879 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleRuleCall_in_entryRuleRuleCall4924 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleRuleCall4934 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleRuleCall4982 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g
index 7915677..d4b95ec 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage__.g
@@ -52,7 +52,7 @@ RULE_INT : ('0'..'9')+;
// $ANTLR src "../org.eclipse.xtext.generator.tests//src-gen/org/eclipse/xtext/parser/terminalrules/parser/antlr/internal/InternalXtextTerminalsTestLanguage.g" 2245
-RULE_STRING : ('"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java
index d65a337..77a4c35 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java
index 1c37b1c..d38adc6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
@@ -28,17 +27,17 @@ public final class TerminalRulesTestLanguageIDConsumer extends AbstractRuleAware
}
protected boolean consumeGroup$1() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$3()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$4()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$13()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java
index 613fc8c..83c74ab 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java
index 0fc8a6e..55eff26 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
@@ -28,13 +27,13 @@ public final class TerminalRulesTestLanguageML_COMMENTConsumer extends AbstractR
}
protected boolean consumeGroup$1() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$2()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeUpToToken$3()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
@@ -45,13 +44,13 @@ public final class TerminalRulesTestLanguageML_COMMENTConsumer extends AbstractR
}
protected boolean consumeUpToToken$3() {
- final IMarker marker = mark();
+ final int marker = mark();
while(!eof()) {
if(consumeKeyword$4())
return true;
incOffset();
}
- marker.rollback();
+ rollbackTo(marker);
return false;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java
index 9bacd65..c15ced6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
@@ -28,17 +27,17 @@ public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractR
}
protected boolean consumeGroup$1() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$3()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeNegatedToken$4()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeGroup$8()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
@@ -54,12 +53,12 @@ public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractR
}
protected boolean doConsumeNegatedToken$4() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!eof() && !consumeAlternatives$5()) {
incOffset();
return true;
}
- marker.rollback();
+ rollbackTo(marker);
return false;
}
@@ -72,11 +71,11 @@ public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractR
}
protected boolean consumeKeyword$6() {
- return readString("\n");
+ return readChar('\n');
}
protected boolean consumeKeyword$7() {
- return readString("\r");
+ return readChar('\r');
}
protected boolean consumeGroup$8() {
@@ -85,13 +84,13 @@ public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractR
}
protected boolean doConsumeGroup$8() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$9()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeKeyword$10()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
@@ -103,11 +102,11 @@ public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractR
}
protected boolean doConsumeKeyword$9() {
- return readString("\r");
+ return readChar('\r');
}
protected boolean consumeKeyword$10() {
- return readString("\n");
+ return readChar('\n');
}
public AbstractRule doGetRule() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java
index 2708a86..0b0926a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
@@ -36,24 +35,24 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeGroup$2() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$4()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$5()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeKeyword$27()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
}
protected boolean consumeKeyword$4() {
- return readChar('"');
+ return readChar('\"');
}
protected boolean consumeAlternatives$5() {
@@ -70,20 +69,20 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeGroup$6() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$7()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$8()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
}
protected boolean consumeKeyword$7() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeAlternatives$8() {
@@ -127,7 +126,7 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$20() {
- return readChar('"');
+ return readChar('\"');
}
protected boolean consumeKeyword$21() {
@@ -135,16 +134,16 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$22() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeNegatedToken$23() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!eof() && !consumeAlternatives$24()) {
incOffset();
return true;
}
- marker.rollback();
+ rollbackTo(marker);
return false;
}
@@ -157,29 +156,29 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$25() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeKeyword$26() {
- return readChar('"');
+ return readChar('\"');
}
protected boolean consumeKeyword$27() {
- return readChar('"');
+ return readChar('\"');
}
protected boolean consumeGroup$28() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$30()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$31()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeKeyword$53()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
@@ -203,20 +202,20 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeGroup$32() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!consumeKeyword$33()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
if (!consumeAlternatives$34()) {
- marker.rollback();
+ rollbackTo(marker);
return false;
}
return true;
}
protected boolean consumeKeyword$33() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeAlternatives$34() {
@@ -260,7 +259,7 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$46() {
- return readChar('"');
+ return readChar('\"');
}
protected boolean consumeKeyword$47() {
@@ -268,16 +267,16 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$48() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeNegatedToken$49() {
- final IMarker marker = mark();
+ final int marker = mark();
if (!eof() && !consumeAlternatives$50()) {
incOffset();
return true;
}
- marker.rollback();
+ rollbackTo(marker);
return false;
}
@@ -290,7 +289,7 @@ public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleA
}
protected boolean consumeKeyword$51() {
- return readString("\\");
+ return readChar('\\');
}
protected boolean consumeKeyword$52() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java
index 121b8b3..40d78f6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
@@ -52,15 +51,15 @@ public final class TerminalRulesTestLanguageWSConsumer extends AbstractRuleAware
}
protected boolean consumeKeyword$5() {
- return readString("\t");
+ return readChar('\t');
}
protected boolean consumeKeyword$6() {
- return readString("\r");
+ return readChar('\r');
}
protected boolean consumeKeyword$7() {
- return readString("\n");
+ return readChar('\n');
}
public AbstractRule doGetRule() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java
index 9c747b4..82eb4f8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java
@@ -6,7 +6,6 @@ package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset;
import org.eclipse.xtext.parser.packrat.IMarkerFactory;
-import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java
index 067d6bd..0c10049 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java
@@ -52,12 +52,15 @@ public final class XtextTerminalsTestLanguageAbstractTokenConsumer extends NonTe
final IMarker marker = mark();
if (!consumeAlternatives$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java
index 5077a59..a5924c4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java
@@ -68,36 +68,45 @@ public final class XtextTerminalsTestLanguageActionConsumer extends NonTerminalC
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$9()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$14()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$15()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$17()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$21()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$22()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -114,12 +123,15 @@ public final class XtextTerminalsTestLanguageActionConsumer extends NonTerminalC
final IMarker marker = mark();
if (!consumeKeyword$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
index d280d16..f807ecf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java
@@ -42,12 +42,15 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -64,16 +67,20 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer
final IMarker marker = mark();
if (!consumeAction$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$5() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java
index ddb6b07..200203d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java
@@ -53,16 +53,20 @@ public final class XtextTerminalsTestLanguageAssignmentConsumer extends NonTermi
final IMarker marker = mark();
if (!consumeAssignment$3()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$11()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
index 2f46b3b..e4a3a91 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java
@@ -42,12 +42,15 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT
final IMarker marker = mark();
if (!consumeRuleCall$2()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$3()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -64,16 +67,20 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT
final IMarker marker = mark();
if (!consumeAction$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$8()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
protected boolean consumeAction$5() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
index bd16940..1237ed7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java
@@ -53,20 +53,25 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeKeyword$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -89,12 +94,15 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT
final IMarker marker = mark();
if (!consumeKeyword$8()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$9()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
index 7e00243..a7d88c5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java
@@ -56,20 +56,25 @@ public final class XtextTerminalsTestLanguageGeneratedMetamodelConsumer extends
final IMarker marker = mark();
if (!consumeKeyword$4()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$5()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$7()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$10()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
@@ -98,12 +103,15 @@ public final class XtextTerminalsTestLanguageGeneratedMetamodelConsumer extends
final IMarker marker = mark();
if (!consumeKeyword$11()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$12()) {
marker.rollback();
+ marker.release();
return false;
}
+ marker.release();
return true;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java
index 3d3df68..c51f579 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java
@@ -70,28 +70,35 @@ public final class XtextTerminalsTestLanguageGrammarConsumer extends NonTerminal
final IMarker marker = mark();
if (!consumeAlternatives$6()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeAssignment$10()) {
marker.rollback();
+ marker.release();
return false;
}
if (!consumeGroup$12()) {
marker.rollback();
+ marker.release();
return false;
}