aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-01-05 05:43:41 (EST)
committersefftinge2009-01-05 05:43:41 (EST)
commitc425a03f3348d70d3c6a8abad6a0b68a39e7fade (patch)
tree81fc445b948ae452bb4f094652075964b857fc52
parent3ee0d81a4498ba1c1c5dfbcfdae15f2f66e2c10b (diff)
downloadorg.eclipse.xtext-c425a03f3348d70d3c6a8abad6a0b68a39e7fade.zip
org.eclipse.xtext-c425a03f3348d70d3c6a8abad6a0b68a39e7fade.tar.gz
org.eclipse.xtext-c425a03f3348d70d3c6a8abad6a0b68a39e7fade.tar.bz2
* CrossRefs for MetamodelDeclarations in xtext grammar (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=257255)
- MetamodelDeclarations link ecore::EPackages * improved robustness of xtext editor * ValueConverters get AbstractNode as argument (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=249952) * minor fixes (typos, etc)
-rw-r--r--devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java7
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore6
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi8
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g56
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java2
-rw-r--r--devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java58
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi4
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g36
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java2
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java38
-rw-r--r--plugins/org.eclipse.xtext.service/src/org/eclipse/xtext/service/GenericServiceFactory.java5
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java4
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/OpenDeclarationAction.java2
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewer.java14
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewerConfiguration.java6
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/BundleClasspathUriResolver.java2
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/JdtClasspathUriResolver.java2
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/WorkspaceClasspathUriResolver.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi8
-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/ImportUriTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g30
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g102
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java256
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java766
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java24
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g30
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageParser.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g18
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java136
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java160
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java38
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java12
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g34
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java36
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g58
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java60
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g46
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java184
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java354
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguage.g30
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageParser.java32
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g20
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java22
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g16
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java118
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java84
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage__.g14
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xmi4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313.g2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Lexer.java2
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/parser/internal/InternalBug250313Parser.java4
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GrammarUtilTest.java15
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageValueConverters.java10
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java1
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguageValueConverters.java9
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/datatyperules/TestValueConverter.java8
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/TypeHierarchyHelperTests.java7
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/resource/metamodel/Xtext2EcoreTransformerTest.java11
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java66
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java48
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/StackOverflowTest.java39
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageGenProposalProvider.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageGenProposalProvider.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageGenProposalProvider.java4
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageGenProposalProvider.java4
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/TestLanguage.xmi4
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/parser/internal/InternalTestLanguage.g8
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/parser/internal/InternalTestLanguageLexer.java2
-rw-r--r--tests/org.eclipse.xtext.ui.core.tests/src-gen/org/eclipse/xtext/ui/core/parser/internal/InternalTestLanguageParser.java10
145 files changed, 1984 insertions, 1851 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
index da9d864..ca90bd2 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
@@ -11,8 +11,8 @@ import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -206,6 +206,11 @@ public class ReferenceGrammarGenProposalProvider extends AbstractProposalProvid
}
+
+
+
+
+
public List<? extends ICompletionProposal> completeReferenceModelCustomType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeReferenceModelCustomType '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
index c70d0ae..e234417 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
@@ -16,12 +16,12 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Person">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
<eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
index ff58520..40de98a 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
@@ -5,8 +5,12 @@
<idElements>xtext</idElements>
<idElements>reference</idElements>
<idElements>ReferenceGrammar</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar" nsURI="http://eclipse.org/xtext/reference/ReferenceGrammar"/>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ReferenceModel" uri="http://eclipse.org/xtext/reference/ReferenceModel"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar">
+ <ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ReferenceModel">
+ <ePackage href="http://eclipse.org/xtext/reference/ReferenceModel#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Spielplatz">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielplatz"/>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g
index f01ff5d..4683a57 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g
@@ -92,7 +92,7 @@ ruleSpielplatz returns [EObject current=null]
}
try {
- factory.set($current, "groesse", lv_groesse,"INT");
+ factory.set($current, "groesse", lv_groesse, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -112,7 +112,7 @@ ruleSpielplatz returns [EObject current=null]
}
try {
- factory.set($current, "beschreibung", lv_beschreibung,"STRING");
+ factory.set($current, "beschreibung", lv_beschreibung, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -130,17 +130,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_kinder=ruleKind
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "kinder", lv_kinder,"Kind");
+ factory.add($current, "kinder", lv_kinder, "Kind", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)
@@ -152,17 +152,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_erzieher=ruleErwachsener
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "erzieher", lv_erzieher,"Erwachsener");
+ factory.add($current, "erzieher", lv_erzieher, "Erwachsener", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
@@ -174,17 +174,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_spielzeuge=ruleSpielzeug
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "spielzeuge", lv_spielzeuge,"Spielzeug");
+ factory.add($current, "spielzeuge", lv_spielzeuge, "Spielzeug", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
@@ -196,17 +196,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_familie=ruleFamilie
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "familie", lv_familie,"Familie");
+ factory.add($current, "familie", lv_familie, "Familie", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
@@ -218,17 +218,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_types=ruleCustomTypeParserRule
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "types", lv_types,"CustomTypeParserRule");
+ factory.add($current, "types", lv_types, "CustomTypeParserRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*)'}'
@@ -277,7 +277,7 @@ ruleKind returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -297,7 +297,7 @@ ruleKind returns [EObject current=null]
}
try {
- factory.set($current, "age", lv_age,"INT");
+ factory.set($current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -347,7 +347,7 @@ ruleErwachsener returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -367,7 +367,7 @@ ruleErwachsener returns [EObject current=null]
}
try {
- factory.set($current, "age", lv_age,"INT");
+ factory.set($current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -417,7 +417,7 @@ ruleSpielzeug returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -431,17 +431,17 @@ ruleSpielzeug returns [EObject current=null]
}
lv_farbe=ruleFarbe
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielzeug");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "farbe", lv_farbe,"Farbe");
+ factory.set($current, "farbe", lv_farbe, "Farbe", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))')'
@@ -498,7 +498,7 @@ ruleFamilie returns [EObject current=null]
}
try {
- factory.set($current, "name", input.LT(-1),null);
+ factory.set($current, "name", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -619,7 +619,7 @@ ruleFarbe returns [EObject current=null]
}
try {
- factory.set($current, "wert", input.LT(-1),null);
+ factory.set($current, "wert", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -661,7 +661,7 @@ ruleCustomTypeParserRule returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
index fbef38e..28bc2e6 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-19 10:41:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2009-01-04 17:10:21
package org.eclipse.xtext.reference.parser.internal;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
index 2a00d28..c70f1a7 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-19 10:41:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2009-01-04 17:10:21
package org.eclipse.xtext.reference.parser.internal;
@@ -163,7 +163,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "groesse", lv_groesse,"INT");
+ factory.set(current, "groesse", lv_groesse, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -197,7 +197,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "beschreibung", lv_beschreibung,"STRING");
+ factory.set(current, "beschreibung", lv_beschreibung, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -307,17 +307,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "kinder", lv_kinder,"Kind");
+ factory.add(current, "kinder", lv_kinder, "Kind", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -339,17 +339,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "erzieher", lv_erzieher,"Erwachsener");
+ factory.add(current, "erzieher", lv_erzieher, "Erwachsener", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -377,17 +377,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "spielzeuge", lv_spielzeuge,"Spielzeug");
+ factory.add(current, "spielzeuge", lv_spielzeuge, "Spielzeug", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -415,17 +415,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "familie", lv_familie,"Familie");
+ factory.add(current, "familie", lv_familie, "Familie", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -453,17 +453,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "types", lv_types,"CustomTypeParserRule");
+ factory.add(current, "types", lv_types, "CustomTypeParserRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -593,7 +593,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -619,7 +619,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "age", lv_age,"INT");
+ factory.set(current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -740,7 +740,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -766,7 +766,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "age", lv_age,"INT");
+ factory.set(current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -888,7 +888,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -910,17 +910,17 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielzeug");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "farbe", lv_farbe,"Farbe");
+ factory.set(current, "farbe", lv_farbe, "Farbe", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1117,7 +1117,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", input.LT(-1),null);
+ factory.set(current, "name", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1449,7 +1449,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "wert", input.LT(-1),null);
+ factory.set(current, "wert", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1543,7 +1543,7 @@ public class InternalReferenceGrammarParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
index 87738bc..7b1cd93 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
@@ -11,8 +11,8 @@ import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
index 1df8fa6..dd17281 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>example</idElements>
<idElements>FowlerDsl</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl" nsURI="http://example.xtext.org/FowlerDsl"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl">
+ <ePackage href="http://example.xtext.org/FowlerDsl#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Statemachine">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDsl#//Statemachine"/>
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g
index f6b849f..2ce5019 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g
@@ -86,17 +86,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_events=ruleEvent
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "events", lv_events,"Event");
+ factory.add($current, "events", lv_events, "Event", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
@@ -115,17 +115,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_commands=ruleCommand
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "commands", lv_commands,"Command");
+ factory.add($current, "commands", lv_commands, "Command", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
@@ -140,17 +140,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_states=ruleState
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "states", lv_states,"State");
+ factory.add($current, "states", lv_states, "State", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -185,7 +185,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "resetting", true,"resetting");
+ factory.set($current, "resetting", true, "resetting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -205,7 +205,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -225,7 +225,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "code", lv_code,"ID");
+ factory.set($current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -263,7 +263,7 @@ ruleCommand returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -283,7 +283,7 @@ ruleCommand returns [EObject current=null]
}
try {
- factory.set($current, "code", lv_code,"ID");
+ factory.set($current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -325,7 +325,7 @@ ruleState returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -366,17 +366,17 @@ ruleState returns [EObject current=null]
}
lv_transitions=ruleTransition
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("State");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "transitions", lv_transitions,"Transition");
+ factory.add($current, "transitions", lv_transitions, "Transition", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
index a70ca4d..07e05a8 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-19 10:41:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2009-01-04 17:10:39
package org.eclipse.xtext.example.parser.internal;
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
index bf9331d..48a05cf 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-19 10:41:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2009-01-04 17:10:38
package org.eclipse.xtext.example.parser.internal;
@@ -160,17 +160,17 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "events", lv_events,"Event");
+ factory.add(current, "events", lv_events, "Event", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -221,17 +221,17 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "commands", lv_commands,"Command");
+ factory.add(current, "commands", lv_commands, "Command", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -275,17 +275,17 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "states", lv_states,"State");
+ factory.add(current, "states", lv_states, "State", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -394,7 +394,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "resetting", true,"resetting");
+ factory.set(current, "resetting", true, "resetting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -420,7 +420,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -446,7 +446,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "code", lv_code,"ID");
+ factory.set(current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -540,7 +540,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -563,7 +563,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "code", lv_code,"ID");
+ factory.set(current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -671,7 +671,7 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -794,17 +794,17 @@ public class InternalFowlerDslParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("State");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "transitions", lv_transitions,"Transition");
+ factory.add(current, "transitions", lv_transitions, "Transition", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
diff --git a/plugins/org.eclipse.xtext.service/src/org/eclipse/xtext/service/GenericServiceFactory.java b/plugins/org.eclipse.xtext.service/src/org/eclipse/xtext/service/GenericServiceFactory.java
index 8efa27e..e622555 100644
--- a/plugins/org.eclipse.xtext.service/src/org/eclipse/xtext/service/GenericServiceFactory.java
+++ b/plugins/org.eclipse.xtext.service/src/org/eclipse/xtext/service/GenericServiceFactory.java
@@ -5,9 +5,8 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
- *******************************************************************************/package org.eclipse.xtext.service;
-
-
+ *******************************************************************************/
+package org.eclipse.xtext.service;
/**
*
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java
index e8b77c4..33bf920 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java
@@ -66,7 +66,7 @@ public class DefaultContentAssistCalculator extends XtextSwitch<List<AbstractEle
* in case of a crossreference which isnt linked properly we evaluate or
* propose it again
*/
- if (referenceNode.getGrammarElement() instanceof CrossReference && !isLinked(referenceNode)) {
+ if (referenceNode != null && referenceNode.getGrammarElement() instanceof CrossReference && !isLinked(referenceNode)) {
nextValidElementSet.add(getAbstractElement(referenceNode));
nextValidElementSet.addAll(ParseTreeUtil.getElementSetValidFromOffset(contentAssistContext.getRootNode(),
referenceNode, contentAssistContext.getOffSet()));
@@ -91,7 +91,7 @@ public class DefaultContentAssistCalculator extends XtextSwitch<List<AbstractEle
nextValidElementSet.add(getAbstractElement(referenceNode));
}
}
- else {
+ else if (referenceNode != null){
nextValidElementSet = ParseTreeUtil.getElementSetValidFromOffset(contentAssistContext.getRootNode(),
referenceNode, contentAssistContext.getOffSet());
}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/OpenDeclarationAction.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/OpenDeclarationAction.java
index e593de2..f033e47 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/OpenDeclarationAction.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/OpenDeclarationAction.java
@@ -99,7 +99,7 @@ public class OpenDeclarationAction extends Action {
URI uri = referenceEObject.eResource().getURI();
- if (ClasspathUriUtil.isClassapthUri(uri)) {
+ if (ClasspathUriUtil.isClasspathUri(uri)) {
uri = resourceSet.getClasspathUriResolver().resolve(resourceSet.getClasspathURIContext(), uri);
}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewer.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewer.java
index 310a97a..ef2b615 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewer.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewer.java
@@ -39,6 +39,13 @@ public class XtextSourceViewer extends ProjectionViewer implements IXtextSourceV
private CompositeNode rootNode;
+ // SZ: Why do we cache this?
+ // Integer as keys are kind of problematic:
+ // on the one hand will nobody refer to any of these integers
+ // thus the cache will discard the entries nearly immediatly,
+ // on the other hand are all integers smaller than 127 singletons
+ // and therefore never discarded by the gc, so the corresponding entries
+ // will never be discarded by the cache
private SimpleCache<Integer, AbstractNode> referenceNodeCache;
private SimpleCache<Integer, AbstractNode> nodeCache;
@@ -61,6 +68,7 @@ public class XtextSourceViewer extends ProjectionViewer implements IXtextSourceV
public void setDocument(IDocument document, IAnnotationModel annotationModel) {
if (getDocument() != null)
((IXtextDocument) getDocument()).removeModelListener(this);
+ init();
super.setDocument(document, annotationModel);
if (document != null)
((IXtextDocument) getDocument()).addModelListener(this);
@@ -71,6 +79,7 @@ public class XtextSourceViewer extends ProjectionViewer implements IXtextSourceV
int modelRangeLength) {
if (getDocument() != null)
((IXtextDocument) getDocument()).removeModelListener(this);
+ init();
super.setDocument(document, annotationModel, modelRangeOffset, modelRangeLength);
if (document != null)
((IXtextDocument) getDocument()).addModelListener(this);
@@ -80,6 +89,7 @@ public class XtextSourceViewer extends ProjectionViewer implements IXtextSourceV
public void setDocument(IDocument document, int visibleRegionOffset, int visibleRegionLength) {
if (getDocument() != null)
((IXtextDocument) getDocument()).removeModelListener(this);
+ init();
super.setDocument(document, visibleRegionOffset, visibleRegionLength);
if (document != null)
((IXtextDocument) getDocument()).addModelListener(this);
@@ -146,21 +156,17 @@ public class XtextSourceViewer extends ProjectionViewer implements IXtextSourceV
private SimpleCache<Integer, AbstractNode> createReferenceNodeCache() {
return new SimpleCache<Integer, AbstractNode>(new Function<Integer, AbstractNode>() {
-
public AbstractNode exec(Integer offset) {
return ParseTreeUtil.getLastCompleteNodeByOffset(getRootNode(), offset);
}
-
});
}
private SimpleCache<Integer, AbstractNode> createNodeCache() {
return new SimpleCache<Integer, AbstractNode>(new Function<Integer, AbstractNode>() {
-
public AbstractNode exec(Integer offset) {
return ParseTreeUtil.getCurrentOrFollowingNodeByOffset(getRootNode(), offset);
}
-
});
}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewerConfiguration.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewerConfiguration.java
index 1e2296e..289933a 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextSourceViewerConfiguration.java
@@ -24,8 +24,9 @@ import org.eclipse.xtext.ui.core.editor.reconciler.XtextReconciler;
public class XtextSourceViewerConfiguration extends TextSourceViewerConfiguration {
- @Inject(optional = true)
- private IContentAssistant contentAssistant;
+// May not be injected, because it is stateful
+// @Inject(optional = true)
+// private IContentAssistant contentAssistant;
@Inject(optional = true)
private IContentAssistProcessor contentAssistProcessor;
@@ -35,6 +36,7 @@ public class XtextSourceViewerConfiguration extends TextSourceViewerConfiguratio
@Override
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+ IContentAssistant contentAssistant = new ContentAssistant();
if (contentAssistant instanceof ISourceViewerAware)
((ISourceViewerAware) contentAssistant).setSourceViewer(sourceViewer);
if (contentAssistant instanceof ContentAssistant && contentAssistProcessor != null) {
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/BundleClasspathUriResolver.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/BundleClasspathUriResolver.java
index bedb1e2..c843dfc 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/BundleClasspathUriResolver.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/BundleClasspathUriResolver.java
@@ -24,7 +24,7 @@ public class BundleClasspathUriResolver implements IClasspathUriResolver {
}
Bundle bundle = (Bundle) context;
try {
- if (ClasspathUriUtil.isClassapthUri(classpathUri)) {
+ if (ClasspathUriUtil.isClasspathUri(classpathUri)) {
return findResourceInBundle(bundle, classpathUri);
}
} catch (Exception exc) {
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/JdtClasspathUriResolver.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/JdtClasspathUriResolver.java
index 441ac91..adf638f 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/JdtClasspathUriResolver.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/JdtClasspathUriResolver.java
@@ -31,7 +31,7 @@ public class JdtClasspathUriResolver implements IClasspathUriResolver {
}
javaElement = (IJavaElement) context;
try {
- if (ClasspathUriUtil.isClassapthUri(classpathUri)) {
+ if (ClasspathUriUtil.isClasspathUri(classpathUri)) {
IJavaProject javaProject = javaElement.getJavaProject();
return findResourceInWorkspace(javaProject, classpathUri);
}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/WorkspaceClasspathUriResolver.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/WorkspaceClasspathUriResolver.java
index a9d115b..f29f8d7 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/WorkspaceClasspathUriResolver.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/util/WorkspaceClasspathUriResolver.java
@@ -23,7 +23,7 @@ public class WorkspaceClasspathUriResolver extends JdtClasspathUriResolver {
}
IResource resource = (IResource) context;
try {
- if (ClasspathUriUtil.isClassapthUri(classpathUri)) {
+ if (ClasspathUriUtil.isClasspathUri(classpathUri)) {
IProject project = resource.getProject();
IJavaProject javaProject = JavaCore.create(project);
return findResourceInWorkspace(javaProject, classpathUri);
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi
index 3ad65b4..cb6b2aa 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi
@@ -4,8 +4,12 @@
<idElements>eclipse</idElements>
<idElements>xtext</idElements>
<idElements>XtextGrammarTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="XtextTest" nsURI="http://www.eclipse.org/2008/Test/XtextTest"/>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore" uri="http://www.eclipse.org/emf/2002/Ecore"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="XtextTest">
+ <ePackage href="http://www.eclipse.org/2008/Test/XtextTest#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
+ <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Grammar">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Grammar"/>
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 e657032..8e01494 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:EAttribute" name="alias">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
index 0d5a9e2..48bb495 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>crossrefs</idElements>
<idElements>ImportUriTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="importedURI" nsURI="http://eclipse.org/xtext/importUriTestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="importedURI">
+ <ePackage href="http://eclipse.org/xtext/importUriTestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Main">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/importUriTestLanguage#//Main"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi
index e29a553..fdb3bc3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>crossrefs</idElements>
<idElements>LangATestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="langATestLanguage" nsURI="http://eclipse.org/xtext/langATestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="langATestLanguage">
+ <ePackage href="http://eclipse.org/xtext/langATestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Main">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/langATestLanguage#//Main"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g
index ab96dd6..5dcecb0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g
@@ -82,17 +82,17 @@ ruleMain returns [EObject current=null]
}
lv_imports=ruleImport
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Main");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "imports", lv_imports,"Import");
+ factory.add($current, "imports", lv_imports, "Import", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*(
@@ -103,17 +103,17 @@ ruleMain returns [EObject current=null]
}
lv_types=ruleType
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Main");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "types", lv_types,"Type");
+ factory.add($current, "types", lv_types, "Type", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -152,7 +152,7 @@ ruleImport returns [EObject current=null]
}
try {
- factory.set($current, "importURI", lv_importURI,"STRING");
+ factory.set($current, "importURI", lv_importURI, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -194,7 +194,7 @@ ruleType returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
index fb278c0..c6e3b4e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-19 13:25:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2009-01-04 17:07:33
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
index 89a4ed2..3ef5393 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-19 13:25:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2009-01-04 17:07:33
package org.eclipse.xtext.crossrefs.parser.internal;
@@ -139,17 +139,17 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Main");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "imports", lv_imports,"Import");
+ factory.add(current, "imports", lv_imports, "Import", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -183,17 +183,17 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Main");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "types", lv_types,"Type");
+ factory.add(current, "types", lv_types, "Type", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -293,7 +293,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "importURI", lv_importURI,"STRING");
+ factory.set(current, "importURI", lv_importURI, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -396,7 +396,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g
index a53e4a5..33846c1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g
@@ -82,17 +82,17 @@ ruleMain returns [EObject current=null]
}
lv_imports=ruleImport
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Main");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "imports", lv_imports,"Import");
+ factory.add($current, "imports", lv_imports, "Import", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*(
@@ -103,17 +103,17 @@ ruleMain returns [EObject current=null]
}
lv_types=ruleType
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Main");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "types", lv_types,"Type");
+ factory.add($current, "types", lv_types, "Type", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -152,7 +152,7 @@ ruleImport returns [EObject current=null]
}
try {
- factory.set($current, "uri", lv_uri,"STRING");
+ factory.set($current, "uri", lv_uri, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -194,7 +194,7 @@ ruleType returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
index b54e884..10ee971 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-19 13:25:07
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2009-01-04 17:07:21
package org.eclipse.xtext.crossrefs.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
index 2fb3ae5..3f931ae 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-19 13:25:07
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2009-01-04 17:07:21
package org.eclipse.xtext.crossrefs.parser.internal;
@@ -139,17 +139,17 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Main");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "imports", lv_imports,"Import");
+ factory.add(current, "imports", lv_imports, "Import", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -183,17 +183,17 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Main");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "types", lv_types,"Type");
+ factory.add(current, "types", lv_types, "Type", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -293,7 +293,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "uri", lv_uri,"STRING");
+ factory.set(current, "uri", lv_uri, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -396,7 +396,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi
index dc9a3d0..8a22c41 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>dummy</idElements>
<idElements>DummyTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="DummyLang" nsURI="http://www.eclipse.org/2008/xtext/DummyLang"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="DummyLang">
+ <ePackage href="http://www.eclipse.org/2008/xtext/DummyLang#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Model">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/DummyLang#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g
index a54e916..67cd907 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g
@@ -82,17 +82,17 @@ ruleModel returns [EObject current=null]
}
lv_elements=ruleElement
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "elements", lv_elements,"Element");
+ factory.add($current, "elements", lv_elements, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*;
@@ -127,7 +127,7 @@ ruleElement returns [EObject current=null]
}
try {
- factory.set($current, "optional", true,"optional");
+ factory.set($current, "optional", true, "optional", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -151,7 +151,7 @@ ruleElement returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -171,7 +171,7 @@ ruleElement returns [EObject current=null]
}
try {
- factory.add($current, "descriptions", lv_descriptions,"STRING");
+ factory.add($current, "descriptions", lv_descriptions, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
index c4ee8ae..13db54f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-19 13:25:12
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2009-01-04 17:07:26
package org.eclipse.xtext.dummy.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
index e0f5b03..d535d0f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-19 13:25:11
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2009-01-04 17:07:26
package org.eclipse.xtext.dummy.parser.internal;
@@ -134,17 +134,17 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "elements", lv_elements,"Element");
+ factory.add(current, "elements", lv_elements, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -256,7 +256,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "optional", true,"optional");
+ factory.set(current, "optional", true, "optional", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -289,7 +289,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -327,7 +327,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.add(current, "descriptions", lv_descriptions,"STRING");
+ factory.add(current, "descriptions", lv_descriptions, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
index ac6fcf9..bf0b479 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi
@@ -5,8 +5,12 @@
<idElements>xtext</idElements>
<idElements>grammarinheritance</idElements>
<idElements>AbstractTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm" uri="classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore"/>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore" uri="http://www.eclipse.org/emf/2002/Ecore"/>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="mm">
+ <ePackage href="classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
+ <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="InheritedParserRule">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore#//AType"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi
index da8e595..f50743d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi
@@ -10,7 +10,9 @@
<superGrammarIdElements>xtext</superGrammarIdElements>
<superGrammarIdElements>grammarinheritance</superGrammarIdElements>
<superGrammarIdElements>AbstractTestLanguage</superGrammarIdElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="foo" nsURI="http://holla"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="foo">
+ <ePackage href="http://holla#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="ConcreteParserRule">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://holla#//ConcreteParserRule"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g
index 667fa21..ddbfb2d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g
@@ -92,7 +92,7 @@ ruleConcreteParserRule returns [EObject current=null]
}
try {
- factory.set($current, "magicNumber", lv_magicNumber,"REAL");
+ factory.set($current, "magicNumber", lv_magicNumber, "REAL", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -110,17 +110,17 @@ ruleConcreteParserRule returns [EObject current=null]
}
lv_elements=ruleInheritedParserRule
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("ConcreteParserRule");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "elements", lv_elements,"InheritedParserRule");
+ factory.add($current, "elements", lv_elements, "InheritedParserRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -159,7 +159,7 @@ ruleInheritedParserRule returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
index 75d71c9..f7fb43c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-19 13:25:08
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2009-01-04 17:07:22
package org.eclipse.xtext.grammarinheritance.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
index ed7d379..16b3c5b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-19 13:25:08
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2009-01-04 17:07:22
package org.eclipse.xtext.grammarinheritance.parser.internal;
@@ -141,7 +141,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "magicNumber", lv_magicNumber,"REAL");
+ factory.set(current, "magicNumber", lv_magicNumber, "REAL", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -182,17 +182,17 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("ConcreteParserRule");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "elements", lv_elements,"InheritedParserRule");
+ factory.add(current, "elements", lv_elements, "InheritedParserRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -292,7 +292,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
index 9493fa0..190b3b0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageMetamodelAccess.java
@@ -23,7 +23,7 @@ public class AbstractTestLanguageMetamodelAccess extends BaseEPackageAccess impl
private EPackage[] referenced = new EPackage[] {
- BaseEPackageAccess.getEPackageFromRegistry("classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore")
+ BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/xtext/tests/grammarinheritance")
,
BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
@@ -33,7 +33,7 @@ public class AbstractTestLanguageMetamodelAccess extends BaseEPackageAccess impl
}
private EPackage[] all = new EPackage[] {
- BaseEPackageAccess.getEPackageFromRegistry("classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore"),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
+ BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore"),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/xtext/tests/grammarinheritance")
};
public EPackage[] getAllEPackages() {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi
index e161777..d3177e0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi
@@ -6,8 +6,12 @@
<idElements>metamodelreferencing</idElements>
<idElements>tests</idElements>
<idElements>MetamodelRefTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="xtext" uri="http://www.eclipse.org/2008/Xtext"/>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="SimpleTest" nsURI="http://eclipse.org/xtext/tests/SimpleTest"/>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="xtext">
+ <ePackage href="http://www.eclipse.org/2008/Xtext#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="SimpleTest">
+ <ePackage href="http://eclipse.org/xtext/tests/SimpleTest#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Foo">
<type metamodel="//@metamodelDeclarations.1">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/tests/SimpleTest#//Foo"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi
index eb3a88c..5ea1363 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi
@@ -6,8 +6,12 @@
<idElements>metamodelreferencing</idElements>
<idElements>tests</idElements>
<idElements>MultiGenMMTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="SimpleTest" nsURI="http://eclipse.org/xtext/tests/SimpleTest"/>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" alias="other" name="OtherTest" nsURI="http://eclipse.org/xtext/tests/OtherTest"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="SimpleTest">
+ <ePackage href="http://eclipse.org/xtext/tests/SimpleTest#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" alias="other" name="OtherTest">
+ <ePackage href="http://eclipse.org/xtext/tests/OtherTest#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Foo">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/tests/SimpleTest#//Foo"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g
index 67fd357..b1acc7b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g
@@ -88,7 +88,7 @@ ruleFoo returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -102,17 +102,17 @@ ruleFoo returns [EObject current=null]
}
lv_nameRefs=ruleNameRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Foo");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "nameRefs", lv_nameRefs,"NameRef");
+ factory.add($current, "nameRefs", lv_nameRefs, "NameRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
index 76e107c..1266182 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-19 13:25:11
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2009-01-04 17:07:25
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
index 5b59567..357d63a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-19 13:25:11
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2009-01-04 17:07:25
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
@@ -130,7 +130,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -161,17 +161,17 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Foo");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "nameRefs", lv_nameRefs,"NameRef");
+ factory.add(current, "nameRefs", lv_nameRefs, "NameRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g
index 4e0c912..cf83e0c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g
@@ -88,7 +88,7 @@ ruleFoo returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -102,17 +102,17 @@ ruleFoo returns [EObject current=null]
}
lv_nameRefs=ruleNameRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Foo");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "nameRefs", lv_nameRefs,"NameRef");
+ factory.add($current, "nameRefs", lv_nameRefs, "NameRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -147,7 +147,7 @@ ruleNameRef returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"STRING");
+ factory.set($current, "name", lv_name, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
index b50b722..a93a02e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-19 13:25:11
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2009-01-04 17:07:25
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
index 33ea312..f864120 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-19 13:25:11
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2009-01-04 17:07:25
package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
@@ -130,7 +130,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -161,17 +161,17 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Foo");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "nameRefs", lv_nameRefs,"NameRef");
+ factory.add(current, "nameRefs", lv_nameRefs, "NameRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -264,7 +264,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"STRING");
+ factory.set(current, "name", lv_name, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi
index 40afd54..89dd856 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi
@@ -6,8 +6,12 @@
<idElements>parser</idElements>
<idElements>datatyperules</idElements>
<idElements>DatatypeRulesTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore" uri="http://www.eclipse.org/emf/2002/Ecore"/>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="DatatypeRulesTestLanguage" nsURI="http://www.eclipse.org/2008/tmf/xtext/DatatypeRulesTest"/>
+ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
+ <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+ </metamodelDeclarations>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="DatatypeRulesTestLanguage">
+ <ePackage href="http://www.eclipse.org/2008/tmf/xtext/DatatypeRulesTest#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="CompositeModel">
<type metamodel="//@metamodelDeclarations.1">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/DatatypeRulesTest#//CompositeModel"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g
index ed44745..5c90d31 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g
@@ -82,17 +82,17 @@ ruleCompositeModel returns [EObject current=null]
}
lv_model=ruleModel
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("CompositeModel");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "model", lv_model,"Model");
+ factory.add($current, "model", lv_model, "Model", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+;
@@ -121,17 +121,17 @@ ruleModel returns [EObject current=null]
}
lv_id=ruleNestedModelId
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "id", lv_id,"NestedModelId");
+ factory.set($current, "id", lv_id, "NestedModelId", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)(':'
@@ -146,17 +146,17 @@ ruleModel returns [EObject current=null]
}
lv_value=ruleFraction
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "value", lv_value,"Fraction");
+ factory.set($current, "value", lv_value, "Fraction", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))?)('#'
@@ -171,17 +171,17 @@ ruleModel returns [EObject current=null]
}
lv_vector=ruleVector
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "vector", lv_vector,"Vector");
+ factory.set($current, "vector", lv_vector, "Vector", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))?)('+'
@@ -196,17 +196,17 @@ ruleModel returns [EObject current=null]
}
lv_dots=ruleDots
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "dots", lv_dots,"Dots");
+ factory.set($current, "dots", lv_dots, "Dots", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))?)';'
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java
index 0ab03a5..4a6a4dd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-19 13:25:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2009-01-04 17:07:36
package org.eclipse.xtext.parser.datatyperules.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java
index 5cb7e81..7ee8f0f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-19 13:25:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2009-01-04 17:07:36
package org.eclipse.xtext.parser.datatyperules.parser.internal;
@@ -135,17 +135,17 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("CompositeModel");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "model", lv_model,"Model");
+ factory.add(current, "model", lv_model, "Model", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -254,17 +254,17 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "id", lv_id,"NestedModelId");
+ factory.set(current, "id", lv_id, "NestedModelId", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -295,17 +295,17 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "value", lv_value,"Fraction");
+ factory.set(current, "value", lv_value, "Fraction", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -345,17 +345,17 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "vector", lv_vector,"Vector");
+ factory.set(current, "vector", lv_vector, "Vector", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -395,17 +395,17 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "dots", lv_dots,"Dots");
+ factory.set(current, "dots", lv_dots, "Dots", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g
index 3993090..17bc75e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g
@@ -88,7 +88,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- factory.set($current, "abstract", true,"abstract language");
+ factory.set($current, "abstract", true, "abstract language", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -113,7 +113,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- factory.add($current, "idElements", lv_idElements,"ID");
+ factory.add($current, "idElements", lv_idElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -137,7 +137,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- factory.add($current, "idElements", lv_idElements,"ID");
+ factory.add($current, "idElements", lv_idElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -161,7 +161,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- factory.add($current, "superGrammarIdElements", lv_superGrammarIdElements,"ID");
+ factory.add($current, "superGrammarIdElements", lv_superGrammarIdElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -185,7 +185,7 @@ ruleGrammar returns [EObject current=null]
}
try {
- factory.add($current, "superGrammarIdElements", lv_superGrammarIdElements,"ID");
+ factory.add($current, "superGrammarIdElements", lv_superGrammarIdElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -199,17 +199,17 @@ ruleGrammar returns [EObject current=null]
}
lv_metamodelDeclarations=ruleAbstractMetamodelDeclaration
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Grammar");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "metamodelDeclarations", lv_metamodelDeclarations,"AbstractMetamodelDeclaration");
+ factory.add($current, "metamodelDeclarations", lv_metamodelDeclarations, "AbstractMetamodelDeclaration", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)(
@@ -220,17 +220,17 @@ ruleGrammar returns [EObject current=null]
}
lv_rules=ruleAbstractRule
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Grammar");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "rules", lv_rules,"AbstractRule");
+ factory.add($current, "rules", lv_rules, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+);
@@ -343,7 +343,7 @@ ruleGeneratedMetamodel returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -363,7 +363,7 @@ ruleGeneratedMetamodel returns [EObject current=null]
}
try {
- factory.set($current, "nsURI", lv_nsURI,"STRING");
+ factory.set($current, "nsURI", lv_nsURI, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -387,7 +387,7 @@ ruleGeneratedMetamodel returns [EObject current=null]
}
try {
- factory.set($current, "alias", lv_alias,"ID");
+ factory.set($current, "alias", lv_alias, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -429,7 +429,7 @@ ruleReferencedMetamodel returns [EObject current=null]
}
try {
- factory.set($current, "uri", lv_uri,"STRING");
+ factory.set($current, "uri", lv_uri, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -453,7 +453,7 @@ ruleReferencedMetamodel returns [EObject current=null]
}
try {
- factory.set($current, "alias", lv_alias,"ID");
+ factory.set($current, "alias", lv_alias, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -500,7 +500,7 @@ ruleLexerRule returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -518,17 +518,17 @@ ruleLexerRule returns [EObject current=null]
}
lv_type=ruleTypeRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("LexerRule");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "type", lv_type,"TypeRef");
+ factory.set($current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))?)':'
@@ -549,7 +549,7 @@ ruleLexerRule returns [EObject current=null]
}
try {
- factory.set($current, "body", lv_body,"STRING");
+ factory.set($current, "body", lv_body, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -591,7 +591,7 @@ ruleParserRule returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -609,17 +609,17 @@ ruleParserRule returns [EObject current=null]
}
lv_type=ruleTypeRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("ParserRule");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "type", lv_type,"TypeRef");
+ factory.set($current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))?)':'
@@ -634,17 +634,17 @@ ruleParserRule returns [EObject current=null]
}
lv_alternatives=ruleAlternatives
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("ParserRule");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "alternatives", lv_alternatives,"Alternatives");
+ factory.set($current, "alternatives", lv_alternatives, "Alternatives", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))';'
@@ -733,7 +733,7 @@ ruleAlternatives returns [EObject current=null]
(((
{
temp=factory.create("Alternatives");
- factory.add(temp, "groups",$current);
+ factory.add(temp, "groups", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -754,17 +754,17 @@ ruleAlternatives returns [EObject current=null]
}
lv_groups=ruleGroup
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("AbstractElement");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "groups", lv_groups,"Group");
+ factory.add($current, "groups", lv_groups, "Group", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*);
@@ -797,7 +797,7 @@ ruleGroup returns [EObject current=null]
((
{
temp=factory.create("Group");
- factory.add(temp, "abstractTokens",$current);
+ factory.add(temp, "abstractTokens", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -814,17 +814,17 @@ ruleGroup returns [EObject current=null]
}
lv_abstractTokens=ruleAbstractToken
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("AbstractElement");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "abstractTokens", lv_abstractTokens,"AbstractToken");
+ factory.add($current, "abstractTokens", lv_abstractTokens, "AbstractToken", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*);
@@ -898,7 +898,7 @@ ruleAbstractToken returns [EObject current=null]
}
try {
- factory.set($current, "cardinality", input.LT(-1),null);
+ factory.set($current, "cardinality", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -936,7 +936,7 @@ ruleAssignment returns [EObject current=null]
}
try {
- factory.set($current, "feature", lv_feature,"ID");
+ factory.set($current, "feature", lv_feature, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -966,7 +966,7 @@ ruleAssignment returns [EObject current=null]
}
try {
- factory.set($current, "operator", input.LT(-1),null);
+ factory.set($current, "operator", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -980,17 +980,17 @@ ruleAssignment returns [EObject current=null]
}
lv_terminal=ruleAbstractTerminal
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Assignment");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "terminal", lv_terminal,"AbstractTerminal");
+ factory.set($current, "terminal", lv_terminal, "AbstractTerminal", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
));
@@ -1031,17 +1031,17 @@ ruleAction returns [EObject current=null]
}
lv_typeName=ruleTypeRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Action");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "typeName", lv_typeName,"TypeRef");
+ factory.set($current, "typeName", lv_typeName, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))'.'
@@ -1062,7 +1062,7 @@ ruleAction returns [EObject current=null]
}
try {
- factory.set($current, "feature", lv_feature,"ID");
+ factory.set($current, "feature", lv_feature, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1087,7 +1087,7 @@ ruleAction returns [EObject current=null]
}
try {
- factory.set($current, "operator", input.LT(-1),null);
+ factory.set($current, "operator", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1188,17 +1188,17 @@ ruleCrossReference returns [EObject current=null]
}
lv_type=ruleTypeRef
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("CrossReference");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "type", lv_type,"TypeRef");
+ factory.set($current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))('|'
@@ -1291,7 +1291,7 @@ ruleKeyword returns [EObject current=null]
}
try {
- factory.set($current, "value", lv_value,"STRING");
+ factory.set($current, "value", lv_value, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
index d45c781..c08cbab 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-19 13:25:10
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2009-01-04 17:09:33
package org.eclipse.xtext.parser.internal;
@@ -53,14 +53,14 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public InternalXtextGrammarTestLanguageLexer(CharStream input) {
super(input);
}
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; }
// $ANTLR start T11
public final void mT11() throws RecognitionException {
try {
int _type = T11;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language'
{
match("abstract language");
@@ -78,8 +78,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language'
{
match("language");
@@ -97,8 +97,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT13() throws RecognitionException {
try {
int _type = T13;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:7: '.'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:7: '.'
{
match('.');
@@ -115,8 +115,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends'
{
match("extends");
@@ -134,8 +134,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate'
{
match("generate");
@@ -153,8 +153,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT16() throws RecognitionException {
try {
int _type = T16;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as'
{
match("as");
@@ -172,8 +172,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT17() throws RecognitionException {
try {
int _type = T17;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import'
{
match("import");
@@ -191,8 +191,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT18() throws RecognitionException {
try {
int _type = T18;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native'
{
match("native");
@@ -210,8 +210,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT19() throws RecognitionException {
try {
int _type = T19;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer'
{
match("lexer");
@@ -229,8 +229,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT20() throws RecognitionException {
try {
int _type = T20;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns'
{
match("returns");
@@ -248,8 +248,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT21() throws RecognitionException {
try {
int _type = T21;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:7: ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:7: ':'
{
match(':');
@@ -266,8 +266,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT22() throws RecognitionException {
try {
int _type = T22;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:7: ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:7: ';'
{
match(';');
@@ -284,8 +284,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT23() throws RecognitionException {
try {
int _type = T23;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:5: ( '::' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:7: '::'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:5: ( '::' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:7: '::'
{
match("::");
@@ -303,8 +303,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT24() throws RecognitionException {
try {
int _type = T24;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '|' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:7: '|'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '|' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:7: '|'
{
match('|');
@@ -321,8 +321,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT25() throws RecognitionException {
try {
int _type = T25;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:5: ( '?' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:7: '?'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:5: ( '?' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:7: '?'
{
match('?');
@@ -339,8 +339,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT26() throws RecognitionException {
try {
int _type = T26;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:5: ( '*' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:7: '*'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:5: ( '*' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:7: '*'
{
match('*');
@@ -357,8 +357,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT27() throws RecognitionException {
try {
int _type = T27;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:5: ( '+' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:7: '+'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:5: ( '+' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:7: '+'
{
match('+');
@@ -375,8 +375,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT28() throws RecognitionException {
try {
int _type = T28;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '+=' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:7: '+='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '+=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:7: '+='
{
match("+=");
@@ -394,8 +394,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT29() throws RecognitionException {
try {
int _type = T29;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '=' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:7: '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:7: '='
{
match('=');
@@ -412,8 +412,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT30() throws RecognitionException {
try {
int _type = T30;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?=' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:7: '?='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:7: '?='
{
match("?=");
@@ -431,8 +431,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT31() throws RecognitionException {
try {
int _type = T31;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '{' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:7: '{'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '{' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:7: '{'
{
match('{');
@@ -449,8 +449,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT32() throws RecognitionException {
try {
int _type = T32;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:5: ( 'current' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:7: 'current'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:5: ( 'current' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:7: 'current'
{
match("current");
@@ -468,8 +468,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT33() throws RecognitionException {
try {
int _type = T33;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '}' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:7: '}'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:7: '}'
{
match('}');
@@ -486,8 +486,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT34() throws RecognitionException {
try {
int _type = T34;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '[' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:7: '['
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '[' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:7: '['
{
match('[');
@@ -504,8 +504,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT35() throws RecognitionException {
try {
int _type = T35;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:5: ( ']' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:7: ']'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:5: ( ']' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:7: ']'
{
match(']');
@@ -522,8 +522,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT36() throws RecognitionException {
try {
int _type = T36;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '(' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:7: '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:7: '('
{
match('(');
@@ -540,8 +540,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mT37() throws RecognitionException {
try {
int _type = T37;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:5: ( ')' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:7: ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:5: ( ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:7: ')'
{
match(')');
@@ -558,10 +558,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -570,7 +570,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:12: '^'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:12: '^'
{
match('^');
@@ -589,7 +589,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -602,7 +602,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.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();
@@ -637,10 +637,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:10: ( ( '0' .. '9' )+ )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -654,7 +654,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:13: '0' .. '9'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:13: '0' .. '9'
{
matchRange('0','9');
@@ -684,7 +684,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -702,10 +702,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
{
match('\"');
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
loop4:
do {
int alt4=3;
@@ -721,7 +721,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343: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' ) {
@@ -738,7 +738,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:65: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:65: ~ ( '\\\\' | '\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -764,10 +764,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
loop5:
do {
int alt5=3;
@@ -783,7 +783,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343: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' ) {
@@ -800,7 +800,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:152: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:152: ~ ( '\\\\' | '\\'' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -838,12 +838,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -868,7 +868,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:52: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:52: .
{
matchAny();
@@ -897,12 +897,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:24: (~ ( '\\n' | '\\r' ) )*
loop8:
do {
int alt8=2;
@@ -915,7 +915,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347: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();
@@ -936,7 +936,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:38: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -945,9 +945,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -956,7 +956,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: '\\r'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: '\\r'
{
match('\r');
@@ -987,10 +987,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -1004,7 +1004,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -1044,8 +1044,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:16: ( . )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:18: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:16: ( . )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:18: .
{
matchAny();
@@ -1059,7 +1059,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=34;
int LA12_0 = input.LA(1);
@@ -1596,238 +1596,238 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:10: T11
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:10: T11
{
mT11();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:14: T12
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:14: T12
{
mT12();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:18: T13
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:18: T13
{
mT13();
}
break;
case 4 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:22: T14
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:22: T14
{
mT14();
}
break;
case 5 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:26: T15
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:26: T15
{
mT15();
}
break;
case 6 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:30: T16
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:30: T16
{
mT16();
}
break;
case 7 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:34: T17
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:34: T17
{
mT17();
}
break;
case 8 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:38: T18
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:38: T18
{
mT18();
}
break;
case 9 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:42: T19
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:42: T19
{
mT19();
}
break;
case 10 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:46: T20
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:46: T20
{
mT20();
}
break;
case 11 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:50: T21
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:50: T21
{
mT21();
}
break;
case 12 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:54: T22
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:54: T22
{
mT22();
}
break;
case 13 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:58: T23
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:58: T23
{
mT23();
}
break;
case 14 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:62: T24
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:62: T24
{
mT24();
}
break;
case 15 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:66: T25
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:66: T25
{
mT25();
}
break;
case 16 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:70: T26
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:70: T26
{
mT26();
}
break;
case 17 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:74: T27
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:74: T27
{
mT27();
}
break;
case 18 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:78: T28
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:78: T28
{
mT28();
}
break;
case 19 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:82: T29
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:82: T29
{
mT29();
}
break;
case 20 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:86: T30
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:86: T30
{
mT30();
}
break;
case 21 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:90: T31
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:90: T31
{
mT31();
}
break;
case 22 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:94: T32
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:94: T32
{
mT32();
}
break;
case 23 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:98: T33
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:98: T33
{
mT33();
}
break;
case 24 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:102: T34
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:102: T34
{
mT34();
}
break;
case 25 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:106: T35
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:106: T35
{
mT35();
}
break;
case 26 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:110: T36
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:110: T36
{
mT36();
}
break;
case 27 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:114: T37
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:114: T37
{
mT37();
}
break;
case 28 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:118: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:118: RULE_ID
{
mRULE_ID();
}
break;
case 29 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:126: RULE_INT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:126: RULE_INT
{
mRULE_INT();
}
break;
case 30 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:135: RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:135: RULE_STRING
{
mRULE_STRING();
}
break;
case 31 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:147: RULE_ML_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:147: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 32 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:163: RULE_SL_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:163: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 33 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:179: RULE_WS
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:179: RULE_WS
{
mRULE_WS();
}
break;
case 34 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_ANY_OTHER
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
index d7a1d73..88555f5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-19 13:25:10
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2009-01-04 17:09:33
package org.eclipse.xtext.parser.internal;
@@ -40,7 +40,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
public String[] getTokenNames() { return tokenNames; }
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; }
@@ -64,7 +64,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleGrammar
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ;
public final EObject entryRuleGrammar() throws RecognitionException {
EObject current = null;
@@ -72,8 +72,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:49: (iv_ruleGrammar= ruleGrammar EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:67:2: iv_ruleGrammar= ruleGrammar EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:49: (iv_ruleGrammar= ruleGrammar EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:67:2: iv_ruleGrammar= ruleGrammar EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleGrammar_in_entryRuleGrammar71);
@@ -99,7 +99,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleGrammar
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:74:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:74:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ;
public final EObject ruleGrammar() throws RecognitionException {
EObject current = null;
@@ -113,25 +113,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:76:33: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:76:33: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )*
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )*
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' )
int alt1=2;
int LA1_0 = input.LA(1);
@@ -149,10 +149,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:79:6: lv_abstract= 'abstract language'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:79:6: lv_abstract= 'abstract language'
{
lv_abstract=(Token)input.LT(1);
match(input,11,FOLLOW_11_in_ruleGrammar132);
@@ -166,7 +166,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "abstract", true,"abstract language");
+ factory.set(current, "abstract", true, "abstract language", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -178,7 +178,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:98:6: 'language'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:98:6: 'language'
{
match(input,12,FOLLOW_12_in_ruleGrammar159);
@@ -190,8 +190,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:102:2: (lv_idElements= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:104:6: lv_idElements= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:102:2: (lv_idElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:104:6: lv_idElements= RULE_ID
{
lv_idElements=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar181);
@@ -205,7 +205,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.add(current, "idElements", lv_idElements,"ID");
+ factory.add(current, "idElements", lv_idElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -216,7 +216,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:3: ( '.' (lv_idElements= RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:3: ( '.' (lv_idElements= RULE_ID ) )*
loop2:
do {
int alt2=2;
@@ -229,14 +229,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:4: '.' (lv_idElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:4: '.' (lv_idElements= RULE_ID )
{
match(input,13,FOLLOW_13_in_ruleGrammar203);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:126:1: (lv_idElements= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:128:6: lv_idElements= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:126:1: (lv_idElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:128:6: lv_idElements= RULE_ID
{
lv_idElements=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar224);
@@ -250,7 +250,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.add(current, "idElements", lv_idElements,"ID");
+ factory.add(current, "idElements", lv_idElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -270,7 +270,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )?
int alt4=2;
int LA4_0 = input.LA(1);
@@ -279,17 +279,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )*
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:7: 'extends' (lv_superGrammarIdElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:7: 'extends' (lv_superGrammarIdElements= RULE_ID )
{
match(input,14,FOLLOW_14_in_ruleGrammar249);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:150:1: (lv_superGrammarIdElements= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:152:6: lv_superGrammarIdElements= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:150:1: (lv_superGrammarIdElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:152:6: lv_superGrammarIdElements= RULE_ID
{
lv_superGrammarIdElements=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar270);
@@ -303,7 +303,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.add(current, "superGrammarIdElements", lv_superGrammarIdElements,"ID");
+ factory.add(current, "superGrammarIdElements", lv_superGrammarIdElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -314,7 +314,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )*
loop3:
do {
int alt3=2;
@@ -327,14 +327,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:4: '.' (lv_superGrammarIdElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:4: '.' (lv_superGrammarIdElements= RULE_ID )
{
match(input,13,FOLLOW_13_in_ruleGrammar292);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:174:1: (lv_superGrammarIdElements= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:176:6: lv_superGrammarIdElements= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:174:1: (lv_superGrammarIdElements= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:176:6: lv_superGrammarIdElements= RULE_ID
{
lv_superGrammarIdElements=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar313);
@@ -348,7 +348,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.add(current, "superGrammarIdElements", lv_superGrammarIdElements,"ID");
+ factory.add(current, "superGrammarIdElements", lv_superGrammarIdElements, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -374,7 +374,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:194:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:194:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )*
loop5:
do {
int alt5=2;
@@ -387,7 +387,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:197:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:197:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -397,17 +397,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Grammar");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "metamodelDeclarations", lv_metamodelDeclarations,"AbstractMetamodelDeclaration");
+ factory.add(current, "metamodelDeclarations", lv_metamodelDeclarations, "AbstractMetamodelDeclaration", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -421,7 +421,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:215:4: (lv_rules= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:215:4: (lv_rules= ruleAbstractRule )+
int cnt6=0;
loop6:
do {
@@ -435,7 +435,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:218:6: lv_rules= ruleAbstractRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:218:6: lv_rules= ruleAbstractRule
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -445,17 +445,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Grammar");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "rules", lv_rules,"AbstractRule");
+ factory.add(current, "rules", lv_rules, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -491,7 +491,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
public final EObject entryRuleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -499,8 +499,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:244:2: iv_ruleAbstractRule= ruleAbstractRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:244:2: iv_ruleAbstractRule= ruleAbstractRule EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule441);
@@ -526,7 +526,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:251:1: ruleAbstractRule returns [EObject current=null] : (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:251:1: ruleAbstractRule returns [EObject current=null] : (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ;
public final EObject ruleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -537,10 +537,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:253:33: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:253:33: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -558,7 +558,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:255:5: this_LexerRule= ruleLexerRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:255:5: this_LexerRule= ruleLexerRule
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -575,7 +575,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:265:5: this_ParserRule= ruleParserRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:265:5: this_ParserRule= ruleParserRule
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -612,7 +612,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractMetamodelDeclaration
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ;
public final EObject entryRuleAbstractMetamodelDeclaration() throws RecognitionException {
EObject current = null;
@@ -620,8 +620,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:281:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:281:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration557);
@@ -647,7 +647,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractMetamodelDeclaration
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:288:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:288:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ;
public final EObject ruleAbstractMetamodelDeclaration() throws RecognitionException {
EObject current = null;
@@ -658,10 +658,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:290:33: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:290:33: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )
int alt8=2;
int LA8_0 = input.LA(1);
@@ -679,7 +679,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:292:5: this_GeneratedMetamodel= ruleGeneratedMetamodel
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:292:5: this_GeneratedMetamodel= ruleGeneratedMetamodel
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -696,7 +696,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:302:5: this_ReferencedMetamodel= ruleReferencedMetamodel
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:302:5: this_ReferencedMetamodel= ruleReferencedMetamodel
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -733,7 +733,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleGeneratedMetamodel
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ;
public final EObject entryRuleGeneratedMetamodel() throws RecognitionException {
EObject current = null;
@@ -741,8 +741,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:318:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:318:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel673);
@@ -768,7 +768,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleGeneratedMetamodel
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:325:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:325:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ;
public final EObject ruleGeneratedMetamodel() throws RecognitionException {
EObject current = null;
@@ -778,24 +778,24 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:327:33: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:327:33: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:4: 'generate' (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:4: 'generate' (lv_name= RULE_ID )
{
match(input,15,FOLLOW_15_in_ruleGeneratedMetamodel719);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:332:1: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:334:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:332:1: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:334:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel740);
@@ -809,7 +809,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -820,8 +820,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:352:3: (lv_nsURI= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:354:6: lv_nsURI= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:352:3: (lv_nsURI= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:354:6: lv_nsURI= RULE_STRING
{
lv_nsURI=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel773);
@@ -835,7 +835,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "nsURI", lv_nsURI,"STRING");
+ factory.set(current, "nsURI", lv_nsURI, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -846,7 +846,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:3: ( 'as' (lv_alias= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:3: ( 'as' (lv_alias= RULE_ID ) )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -855,14 +855,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:4: 'as' (lv_alias= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:4: 'as' (lv_alias= RULE_ID )
{
match(input,16,FOLLOW_16_in_ruleGeneratedMetamodel795);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:376:1: (lv_alias= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:378:6: lv_alias= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:376:1: (lv_alias= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:378:6: lv_alias= RULE_ID
{
lv_alias=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel816);
@@ -876,7 +876,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "alias", lv_alias,"ID");
+ factory.set(current, "alias", lv_alias, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -911,7 +911,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleReferencedMetamodel
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ;
public final EObject entryRuleReferencedMetamodel() throws RecognitionException {
EObject current = null;
@@ -919,8 +919,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:404:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:404:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel862);
@@ -946,7 +946,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleReferencedMetamodel
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:411:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:411:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ;
public final EObject ruleReferencedMetamodel() throws RecognitionException {
EObject current = null;
@@ -955,21 +955,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:413:33: ( ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:413:33: ( ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:3: 'import' (lv_uri= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:3: 'import' (lv_uri= RULE_STRING )
{
match(input,17,FOLLOW_17_in_ruleReferencedMetamodel907);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:418:1: (lv_uri= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:420:6: lv_uri= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:418:1: (lv_uri= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:420:6: lv_uri= RULE_STRING
{
lv_uri=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleReferencedMetamodel928);
@@ -983,7 +983,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "uri", lv_uri,"STRING");
+ factory.set(current, "uri", lv_uri, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -994,7 +994,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:3: ( 'as' (lv_alias= RULE_ID ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:3: ( 'as' (lv_alias= RULE_ID ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1003,14 +1003,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:4: 'as' (lv_alias= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:4: 'as' (lv_alias= RULE_ID )
{
match(input,16,FOLLOW_16_in_ruleReferencedMetamodel950);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:442:1: (lv_alias= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:444:6: lv_alias= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:442:1: (lv_alias= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:444:6: lv_alias= RULE_ID
{
lv_alias=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReferencedMetamodel971);
@@ -1024,7 +1024,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "alias", lv_alias,"ID");
+ factory.set(current, "alias", lv_alias, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1059,7 +1059,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleLexerRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:1: entryRuleLexerRule returns [EObject current=null] : iv_ruleLexerRule= ruleLexerRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:1: entryRuleLexerRule returns [EObject current=null] : iv_ruleLexerRule= ruleLexerRule EOF ;
public final EObject entryRuleLexerRule() throws RecognitionException {
EObject current = null;
@@ -1067,8 +1067,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:51: (iv_ruleLexerRule= ruleLexerRule EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:470:2: iv_ruleLexerRule= ruleLexerRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:51: (iv_ruleLexerRule= ruleLexerRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:470:2: iv_ruleLexerRule= ruleLexerRule EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleLexerRule_in_entryRuleLexerRule1017);
@@ -1094,7 +1094,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleLexerRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:477:1: ruleLexerRule returns [EObject current=null] : ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:477:1: ruleLexerRule returns [EObject current=null] : ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ;
public final EObject ruleLexerRule() throws RecognitionException {
EObject current = null;
@@ -1105,25 +1105,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:479:33: ( ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:479:33: ( ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' ) (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' ) (lv_name= RULE_ID )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' )
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1141,7 +1141,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:7: 'native'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:7: 'native'
{
match(input,18,FOLLOW_18_in_ruleLexerRule1066);
@@ -1151,7 +1151,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:485:6: 'lexer'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:485:6: 'lexer'
{
match(input,19,FOLLOW_19_in_ruleLexerRule1081);
@@ -1163,8 +1163,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:489:2: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:491:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:489:2: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:491:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLexerRule1103);
@@ -1178,7 +1178,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1189,7 +1189,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:3: ( 'returns' (lv_type= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:3: ( 'returns' (lv_type= ruleTypeRef ) )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1198,14 +1198,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:4: 'returns' (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:4: 'returns' (lv_type= ruleTypeRef )
{
match(input,20,FOLLOW_20_in_ruleLexerRule1125);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:513:1: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:516:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:513:1: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:516:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1215,17 +1215,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("LexerRule");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "type", lv_type,"TypeRef");
+ factory.set(current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1246,8 +1246,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:538:2: (lv_body= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:540:6: lv_body= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:538:2: (lv_body= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:540:6: lv_body= RULE_STRING
{
lv_body=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleLexerRule1197);
@@ -1261,7 +1261,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "body", lv_body,"STRING");
+ factory.set(current, "body", lv_body, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1297,7 +1297,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleParserRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ;
public final EObject entryRuleParserRule() throws RecognitionException {
EObject current = null;
@@ -1305,8 +1305,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:52: (iv_ruleParserRule= ruleParserRule EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:570:2: iv_ruleParserRule= ruleParserRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:52: (iv_ruleParserRule= ruleParserRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:570:2: iv_ruleParserRule= ruleParserRule EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleParserRule_in_entryRuleParserRule1251);
@@ -1332,7 +1332,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleParserRule
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:577:1: ruleParserRule returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:577:1: ruleParserRule returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ;
public final EObject ruleParserRule() throws RecognitionException {
EObject current = null;
@@ -1344,23 +1344,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:579:33: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:579:33: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:582:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:582:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1310);
@@ -1374,7 +1374,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1382,7 +1382,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:2: ( 'returns' (lv_type= ruleTypeRef ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:2: ( 'returns' (lv_type= ruleTypeRef ) )?
int alt13=2;
int LA13_0 = input.LA(1);
@@ -1391,14 +1391,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt13) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:3: 'returns' (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:3: 'returns' (lv_type= ruleTypeRef )
{
match(input,20,FOLLOW_20_in_ruleParserRule1331);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:604:1: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:607:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:604:1: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:607:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1408,17 +1408,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("ParserRule");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "type", lv_type,"TypeRef");
+ factory.set(current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1439,8 +1439,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:629:2: (lv_alternatives= ruleAlternatives )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:632:6: lv_alternatives= ruleAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:629:2: (lv_alternatives= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:632:6: lv_alternatives= ruleAlternatives
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1450,17 +1450,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("ParserRule");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "alternatives", lv_alternatives,"Alternatives");
+ factory.set(current, "alternatives", lv_alternatives, "Alternatives", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1493,7 +1493,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleTypeRef
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ;
public final EObject entryRuleTypeRef() throws RecognitionException {
EObject current = null;
@@ -1501,8 +1501,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:49: (iv_ruleTypeRef= ruleTypeRef EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:662:2: iv_ruleTypeRef= ruleTypeRef EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:49: (iv_ruleTypeRef= ruleTypeRef EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:662:2: iv_ruleTypeRef= ruleTypeRef EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1463);
@@ -1528,19 +1528,19 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleTypeRef
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:669:1: ruleTypeRef returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:669:1: ruleTypeRef returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ;
public final EObject ruleTypeRef() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:671:33: ( ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:671:33: ( ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )?
int alt14=2;
int LA14_0 = input.LA(1);
@@ -1553,10 +1553,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt14) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) ) '::'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) ) '::'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:675:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:675:3: ( RULE_ID )
{
if (current==null) {
@@ -1564,8 +1564,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:681:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:682:2: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:681:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:682:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1523);
@@ -1587,8 +1587,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:691:3: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:694:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:691:3: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:694:3: ( RULE_ID )
{
if (current==null) {
@@ -1596,8 +1596,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:700:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:701:2: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:700:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:701:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1562);
@@ -1630,7 +1630,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAlternatives
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ;
public final EObject entryRuleAlternatives() throws RecognitionException {
EObject current = null;
@@ -1638,8 +1638,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:54: (iv_ruleAlternatives= ruleAlternatives EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:714:2: iv_ruleAlternatives= ruleAlternatives EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:54: (iv_ruleAlternatives= ruleAlternatives EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:714:2: iv_ruleAlternatives= ruleAlternatives EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives1599);
@@ -1665,7 +1665,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAlternatives
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:721:1: ruleAlternatives returns [EObject current=null] : (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:721:1: ruleAlternatives returns [EObject current=null] : (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ;
public final EObject ruleAlternatives() throws RecognitionException {
EObject current = null;
@@ -1676,11 +1676,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:723:33: ( (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:723:33: ( (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:725:5: this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:725:5: this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )*
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
@@ -1693,7 +1693,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
current = this_Group;
currentNode = currentNode.getParent();
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:1: ( ( () '|' ) (lv_groups= ruleGroup ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:1: ( ( () '|' ) (lv_groups= ruleGroup ) )*
loop15:
do {
int alt15=2;
@@ -1706,17 +1706,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt15) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' ) (lv_groups= ruleGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' ) (lv_groups= ruleGroup )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: () '|'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: () '|'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: ()
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:734:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:734:5:
{
temp=factory.create("Alternatives");
- factory.add(temp, "groups",current);
+ factory.add(temp, "groups", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -1735,8 +1735,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:749:2: (lv_groups= ruleGroup )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:752:6: lv_groups= ruleGroup
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:749:2: (lv_groups= ruleGroup )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:752:6: lv_groups= ruleGroup
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1746,17 +1746,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("AbstractElement");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "groups", lv_groups,"Group");
+ factory.add(current, "groups", lv_groups, "Group", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1791,7 +1791,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleGroup
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ;
public final EObject entryRuleGroup() throws RecognitionException {
EObject current = null;
@@ -1799,8 +1799,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:47: (iv_ruleGroup= ruleGroup EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:778:2: iv_ruleGroup= ruleGroup EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:47: (iv_ruleGroup= ruleGroup EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:778:2: iv_ruleGroup= ruleGroup EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup1749);
@@ -1826,7 +1826,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleGroup
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:785:1: ruleGroup returns [EObject current=null] : (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:785:1: ruleGroup returns [EObject current=null] : (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ;
public final EObject ruleGroup() throws RecognitionException {
EObject current = null;
@@ -1837,11 +1837,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:787:33: ( (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:787:33: ( (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:789:5: this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:789:5: this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )*
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode);
@@ -1854,7 +1854,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
current = this_AbstractToken;
currentNode = currentNode.getParent();
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:1: ( () (lv_abstractTokens= ruleAbstractToken ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:1: ( () (lv_abstractTokens= ruleAbstractToken ) )*
loop16:
do {
int alt16=2;
@@ -1867,14 +1867,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt16) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: () (lv_abstractTokens= ruleAbstractToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: () (lv_abstractTokens= ruleAbstractToken )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: ()
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:798:5:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: ()
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:798:5:
{
temp=factory.create("Group");
- factory.add(temp, "abstractTokens",current);
+ factory.add(temp, "abstractTokens", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -1886,8 +1886,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:809:2: (lv_abstractTokens= ruleAbstractToken )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:812:6: lv_abstractTokens= ruleAbstractToken
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:809:2: (lv_abstractTokens= ruleAbstractToken )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:812:6: lv_abstractTokens= ruleAbstractToken
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -1897,17 +1897,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("AbstractElement");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "abstractTokens", lv_abstractTokens,"AbstractToken");
+ factory.add(current, "abstractTokens", lv_abstractTokens, "AbstractToken", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1942,7 +1942,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractToken
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ;
public final EObject entryRuleAbstractToken() throws RecognitionException {
EObject current = null;
@@ -1950,8 +1950,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:55: (iv_ruleAbstractToken= ruleAbstractToken EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:838:2: iv_ruleAbstractToken= ruleAbstractToken EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:55: (iv_ruleAbstractToken= ruleAbstractToken EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:838:2: iv_ruleAbstractToken= ruleAbstractToken EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken1888);
@@ -1977,7 +1977,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractToken
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:845:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:845:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ;
public final EObject ruleAbstractToken() throws RecognitionException {
EObject current = null;
@@ -1991,13 +1991,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:847:33: ( ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:847:33: ( ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )
int alt18=2;
switch ( input.LA(1) ) {
case RULE_ID:
@@ -2039,9 +2039,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
switch (alt18) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )
int alt17=2;
int LA17_0 = input.LA(1);
@@ -2059,7 +2059,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt17) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:849:5: this_Assignment= ruleAssignment
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:849:5: this_Assignment= ruleAssignment
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -2076,7 +2076,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:859:5: this_Action= ruleAction
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:859:5: this_Action= ruleAction
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -2099,7 +2099,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:869:5: this_AbstractTerminal= ruleAbstractTerminal
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:869:5: this_AbstractTerminal= ruleAbstractTerminal
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -2118,7 +2118,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:2: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:2: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )?
int alt21=2;
int LA21_0 = input.LA(1);
@@ -2127,9 +2127,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt21) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:6: lv_cardinality= ( ( '?' | '*' ) | '+' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:6: lv_cardinality= ( ( '?' | '*' ) | '+' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:21: ( ( '?' | '*' ) | '+' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:21: ( ( '?' | '*' ) | '+' )
int alt20=2;
int LA20_0 = input.LA(1);
@@ -2147,9 +2147,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt20) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' )
int alt19=2;
int LA19_0 = input.LA(1);
@@ -2167,7 +2167,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt19) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:23: '?'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:23: '?'
{
match(input,25,FOLLOW_25_in_ruleAbstractToken2025);
@@ -2177,7 +2177,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:884:6: '*'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:884:6: '*'
{
match(input,26,FOLLOW_26_in_ruleAbstractToken2040);
@@ -2193,7 +2193,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:889:6: '+'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:889:6: '+'
{
match(input,27,FOLLOW_27_in_ruleAbstractToken2056);
@@ -2212,7 +2212,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "cardinality", input.LT(-1),null);
+ factory.set(current, "cardinality", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -2244,7 +2244,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAssignment
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
public final EObject entryRuleAssignment() throws RecognitionException {
EObject current = null;
@@ -2252,8 +2252,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:52: (iv_ruleAssignment= ruleAssignment EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:915:2: iv_ruleAssignment= ruleAssignment EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:52: (iv_ruleAssignment= ruleAssignment EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:915:2: iv_ruleAssignment= ruleAssignment EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.11" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2103);
@@ -2279,7 +2279,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAssignment
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:922:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:922:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ;
public final EObject ruleAssignment() throws RecognitionException {
EObject current = null;
@@ -2290,17 +2290,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:924:33: ( ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:924:33: ( ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:927:6: lv_feature= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:927:6: lv_feature= RULE_ID
{
lv_feature=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment2160);
@@ -2314,7 +2314,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "feature", lv_feature,"ID");
+ factory.set(current, "feature", lv_feature, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -2322,10 +2322,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:2: (lv_operator= ( ( '+=' | '=' ) | '?=' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:6: lv_operator= ( ( '+=' | '=' ) | '?=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:2: (lv_operator= ( ( '+=' | '=' ) | '?=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:6: lv_operator= ( ( '+=' | '=' ) | '?=' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:18: ( ( '+=' | '=' ) | '?=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:18: ( ( '+=' | '=' ) | '?=' )
int alt23=2;
int LA23_0 = input.LA(1);
@@ -2343,9 +2343,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt23) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' )
int alt22=2;
int LA22_0 = input.LA(1);
@@ -2363,7 +2363,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt22) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:20: '+='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:20: '+='
{
match(input,28,FOLLOW_28_in_ruleAssignment2194);
@@ -2373,7 +2373,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:952:6: '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:952:6: '='
{
match(input,29,FOLLOW_29_in_ruleAssignment2209);
@@ -2389,7 +2389,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:957:6: '?='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:957:6: '?='
{
match(input,30,FOLLOW_30_in_ruleAssignment2225);
@@ -2408,7 +2408,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "operator", input.LT(-1),null);
+ factory.set(current, "operator", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -2419,8 +2419,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:975:3: (lv_terminal= ruleAbstractTerminal )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:978:6: lv_terminal= ruleAbstractTerminal
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:975:3: (lv_terminal= ruleAbstractTerminal )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:978:6: lv_terminal= ruleAbstractTerminal
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.11/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -2430,17 +2430,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Assignment");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "terminal", lv_terminal,"AbstractTerminal");
+ factory.set(current, "terminal", lv_terminal, "AbstractTerminal", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -2466,7 +2466,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAction
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ;
public final EObject entryRuleAction() throws RecognitionException {
EObject current = null;
@@ -2474,8 +2474,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:48: (iv_ruleAction= ruleAction EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1004:2: iv_ruleAction= ruleAction EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:48: (iv_ruleAction= ruleAction EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1004:2: iv_ruleAction= ruleAction EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAction_in_entryRuleAction2310);
@@ -2501,7 +2501,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAction
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1011:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1011:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ;
public final EObject ruleAction() throws RecognitionException {
EObject current = null;
@@ -2512,35 +2512,35 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1013:33: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1013:33: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:8: '{' ( 'current' '=' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:8: '{' ( 'current' '=' )?
{
match(input,31,FOLLOW_31_in_ruleAction2360);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:1: ( 'current' '=' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:1: ( 'current' '=' )?
int alt24=2;
int LA24_0 = input.LA(1);
@@ -2549,7 +2549,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt24) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:2: 'current' '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:2: 'current' '='
{
match(input,32,FOLLOW_32_in_ruleAction2370);
@@ -2568,8 +2568,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1026:4: (lv_typeName= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1029:6: lv_typeName= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1026:4: (lv_typeName= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1029:6: lv_typeName= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -2579,17 +2579,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Action");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "typeName", lv_typeName,"TypeRef");
+ factory.set(current, "typeName", lv_typeName, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -2604,8 +2604,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1051:2: (lv_feature= RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1053:6: lv_feature= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1051:2: (lv_feature= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1053:6: lv_feature= RULE_ID
{
lv_feature=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction2452);
@@ -2619,7 +2619,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "feature", lv_feature,"ID");
+ factory.set(current, "feature", lv_feature, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -2630,10 +2630,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:3: (lv_operator= ( '=' | '+=' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:6: lv_operator= ( '=' | '+=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:3: (lv_operator= ( '=' | '+=' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:6: lv_operator= ( '=' | '+=' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:18: ( '=' | '+=' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:18: ( '=' | '+=' )
int alt25=2;
int LA25_0 = input.LA(1);
@@ -2651,7 +2651,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt25) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:19: '='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:19: '='
{
match(input,29,FOLLOW_29_in_ruleAction2486);
@@ -2661,7 +2661,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1078:6: '+='
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1078:6: '+='
{
match(input,28,FOLLOW_28_in_ruleAction2501);
@@ -2680,7 +2680,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "operator", input.LT(-1),null);
+ factory.set(current, "operator", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -2723,7 +2723,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractTerminal
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ;
public final EObject entryRuleAbstractTerminal() throws RecognitionException {
EObject current = null;
@@ -2731,8 +2731,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1112:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1112:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal2567);
@@ -2758,7 +2758,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractTerminal
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1119:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1119:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ;
public final EObject ruleAbstractTerminal() throws RecognitionException {
EObject current = null;
@@ -2773,10 +2773,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1121:33: ( ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1121:33: ( ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )
int alt28=2;
int LA28_0 = input.LA(1);
@@ -2794,9 +2794,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt28) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )
int alt27=2;
int LA27_0 = input.LA(1);
@@ -2814,9 +2814,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt27) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )
int alt26=2;
int LA26_0 = input.LA(1);
@@ -2834,7 +2834,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt26) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1123:5: this_Keyword= ruleKeyword
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1123:5: this_Keyword= ruleKeyword
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -2851,7 +2851,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1133:5: this_RuleCall= ruleRuleCall
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1133:5: this_RuleCall= ruleRuleCall
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -2874,7 +2874,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1143:5: this_ParenthesizedElement= ruleParenthesizedElement
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1143:5: this_ParenthesizedElement= ruleParenthesizedElement
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -2897,7 +2897,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1153:5: this_CrossReference= ruleCrossReference
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1153:5: this_CrossReference= ruleCrossReference
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -2934,7 +2934,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleCrossReference
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ;
public final EObject entryRuleCrossReference() throws RecognitionException {
EObject current = null;
@@ -2942,8 +2942,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:56: (iv_ruleCrossReference= ruleCrossReference EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1169:2: iv_ruleCrossReference= ruleCrossReference EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:56: (iv_ruleCrossReference= ruleCrossReference EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1169:2: iv_ruleCrossReference= ruleCrossReference EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference2741);
@@ -2969,7 +2969,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleCrossReference
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1176:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1176:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ;
public final EObject ruleCrossReference() throws RecognitionException {
EObject current = null;
@@ -2978,24 +2978,24 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1178:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1178:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )?
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:4: '[' (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:4: '[' (lv_type= ruleTypeRef )
{
match(input,34,FOLLOW_34_in_ruleCrossReference2787);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1183:1: (lv_type= ruleTypeRef )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1186:6: lv_type= ruleTypeRef
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1183:1: (lv_type= ruleTypeRef )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1186:6: lv_type= ruleTypeRef
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -3005,17 +3005,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("CrossReference");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "type", lv_type,"TypeRef");
+ factory.set(current, "type", lv_type, "TypeRef", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -3023,7 +3023,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:3: ( '|' ( ( RULE_ID ) ) )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:3: ( '|' ( ( RULE_ID ) ) )?
int alt29=2;
int LA29_0 = input.LA(1);
@@ -3032,14 +3032,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
switch (alt29) {
case 1 :
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:4: '|' ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:4: '|' ( ( RULE_ID ) )
{
match(input,24,FOLLOW_24_in_ruleCrossReference2836);
createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1208:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1211:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1208:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1211:3: ( RULE_ID )
{
if (current==null) {
@@ -3047,8 +3047,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1217:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1218:2: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1217:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1218:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference2860);
@@ -3094,7 +3094,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleParenthesizedElement
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ;
public final EObject entryRuleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -3102,8 +3102,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1235:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1235:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.15" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2909);
@@ -3129,7 +3129,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleParenthesizedElement
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1242:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1242:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ;
public final EObject ruleParenthesizedElement() throws RecognitionException {
EObject current = null;
@@ -3138,14 +3138,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1244:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1244:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives ) ')'
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:3: '(' this_Alternatives= ruleAlternatives
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:3: '(' this_Alternatives= ruleAlternatives
{
match(input,36,FOLLOW_36_in_ruleParenthesizedElement2954);
@@ -3190,7 +3190,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleKeyword
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
public final EObject entryRuleKeyword() throws RecognitionException {
EObject current = null;
@@ -3198,8 +3198,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:49: (iv_ruleKeyword= ruleKeyword EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1270:2: iv_ruleKeyword= ruleKeyword EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:49: (iv_ruleKeyword= ruleKeyword EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1270:2: iv_ruleKeyword= ruleKeyword EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.16" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword3018);
@@ -3225,7 +3225,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleKeyword
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1277:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1277:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ;
public final EObject ruleKeyword() throws RecognitionException {
EObject current = null;
@@ -3233,11 +3233,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1279:33: ( (lv_value= RULE_STRING ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1279:33: ( (lv_value= RULE_STRING ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1282:6: lv_value= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1282:6: lv_value= RULE_STRING
{
lv_value=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword3073);
@@ -3251,7 +3251,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "value", lv_value,"STRING");
+ factory.set(current, "value", lv_value, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -3277,7 +3277,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleRuleCall
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ;
public final EObject entryRuleRuleCall() throws RecognitionException {
EObject current = null;
@@ -3285,8 +3285,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:50: (iv_ruleRuleCall= ruleRuleCall EOF )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1308:2: iv_ruleRuleCall= ruleRuleCall EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:50: (iv_ruleRuleCall= ruleRuleCall EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1308:2: iv_ruleRuleCall= ruleRuleCall EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.17" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall3116);
@@ -3312,17 +3312,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleRuleCall
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1315:1: ruleRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1315:1: ruleRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ;
public final EObject ruleRuleCall() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1317:33: ( ( ( RULE_ID ) ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1317:33: ( ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1321:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1321:3: ( RULE_ID )
{
if (current==null) {
@@ -3330,8 +3330,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1327:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1328:2: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1327:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1328:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall3174);
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g
index a069972..9d60b91 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g
@@ -35,25 +35,25 @@ T35 : ']' ;
T36 : '(' ;
T37 : ')' ;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1339
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1339
RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1341
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1341
RULE_INT : ('0'..'9')+;
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1343
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1343
RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1345
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1345
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1347
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1347
RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1349
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1349
RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1351
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1351
RULE_ANY_OTHER : .;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi
index 15c4afd..bb18d16 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi
@@ -6,7 +6,9 @@
<idElements>parsetree</idElements>
<idElements>formatter</idElements>
<idElements>FormatterTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="formattertestlanguage" nsURI="http://simple/formattertestlanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="formattertestlanguage">
+ <ePackage href="http://simple/formattertestlanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Root">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://simple/formattertestlanguage#//Root"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g
index 2e8ac7a..fad6658 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g
@@ -129,7 +129,7 @@ ruleLine returns [EObject current=null]
}
try {
- factory.add($current, "type", lv_type,"ID");
+ factory.add($current, "type", lv_type, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -149,7 +149,7 @@ ruleLine returns [EObject current=null]
}
try {
- factory.add($current, "name", lv_name,"ID");
+ factory.add($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -189,17 +189,17 @@ ruleTestLinewrap returns [EObject current=null]
}
lv_items=ruleLine
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("TestLinewrap");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "items", lv_items,"Line");
+ factory.add($current, "items", lv_items, "Line", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -236,17 +236,17 @@ ruleTestIndentation returns [EObject current=null]
}
lv_sub=ruleTestIndentation
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("TestIndentation");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "sub", lv_sub,"TestIndentation");
+ factory.add($current, "sub", lv_sub, "TestIndentation", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)
@@ -258,17 +258,17 @@ ruleTestIndentation returns [EObject current=null]
}
lv_items=ruleLine
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("TestIndentation");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "items", lv_items,"Line");
+ factory.add($current, "items", lv_items, "Line", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*)'}'
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java
index a9740af..1a99b28 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-19 13:25:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2009-01-04 17:07:36
package org.eclipse.xtext.parsetree.formatter.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java
index 7707267..96dae79 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-19 13:25:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2009-01-04 17:07:35
package org.eclipse.xtext.parsetree.formatter.parser.internal;
@@ -263,7 +263,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.add(current, "type", lv_type,"ID");
+ factory.add(current, "type", lv_type, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -286,7 +286,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.add(current, "name", lv_name,"ID");
+ factory.add(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -399,17 +399,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("TestLinewrap");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "items", lv_items,"Line");
+ factory.add(current, "items", lv_items, "Line", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -539,17 +539,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("TestIndentation");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "sub", lv_sub,"TestIndentation");
+ factory.add(current, "sub", lv_sub, "TestIndentation", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -571,17 +571,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("TestIndentation");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "items", lv_items,"Line");
+ factory.add(current, "items", lv_items, "Line", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi
index 7aefe16..b5f8173 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi
@@ -6,7 +6,9 @@
<idElements>parsetree</idElements>
<idElements>reconstr</idElements>
<idElements>ComplexReconstrTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="complexrewritetest" nsURI="http://complex/rewrite/test"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="complexrewritetest">
+ <ePackage href="http://complex/rewrite/test#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Op">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://complex/rewrite/test#//Expression"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi
index dfaefc9..33f382f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi
@@ -6,7 +6,9 @@
<idElements>parsetree</idElements>
<idElements>reconstr</idElements>
<idElements>SimpleReconstrTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simplerewritetest" nsURI="http://simple/rewrite/test"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simplerewritetest">
+ <ePackage href="http://simple/rewrite/test#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Op">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://simple/rewrite/test#//Expression"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g
index 12bdced..b75f647 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g
@@ -86,7 +86,7 @@ ruleOp returns [EObject current=null]
((((
{
temp=factory.create("Add");
- factory.add(temp, "addOperands",$current);
+ factory.add(temp, "addOperands", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -107,24 +107,24 @@ ruleOp returns [EObject current=null]
}
lv_addOperands=ruleTerm
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "addOperands", lv_addOperands,"Term");
+ factory.add($current, "addOperands", lv_addOperands, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
|(((
{
temp=factory.create("Minus");
- factory.add(temp, "minusOperands",$current);
+ factory.add(temp, "minusOperands", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -145,17 +145,17 @@ ruleOp returns [EObject current=null]
}
lv_minusOperands=ruleTerm
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "minusOperands", lv_minusOperands,"Term");
+ factory.add($current, "minusOperands", lv_minusOperands, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)))*);
@@ -227,7 +227,7 @@ ruleAtom returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -282,7 +282,7 @@ ruleParens returns [EObject current=null]
}
try {
- factory.set($current, "em", input.LT(-1),"!");
+ factory.set($current, "em", input.LT(-1), "!", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -322,7 +322,7 @@ ruleTrickyA1 returns [EObject current=null]
}
try {
- factory.add($current, "name", lv_name,"ID");
+ factory.add($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
index b9a15f2..1d794a5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-19 13:25:14
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2009-01-04 17:07:28
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
index 0f34cb4..0c8fd4c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-19 13:25:14
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2009-01-04 17:07:28
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
@@ -158,7 +158,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
{
temp=factory.create("Add");
- factory.add(temp, "addOperands",current);
+ factory.add(temp, "addOperands", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -188,17 +188,17 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "addOperands", lv_addOperands,"Term");
+ factory.add(current, "addOperands", lv_addOperands, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -223,7 +223,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
{
temp=factory.create("Minus");
- factory.add(temp, "minusOperands",current);
+ factory.add(temp, "minusOperands", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -253,17 +253,17 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "minusOperands", lv_minusOperands,"Term");
+ factory.add(current, "minusOperands", lv_minusOperands, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -483,7 +483,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -614,7 +614,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
}
try {
- factory.set(current, "em", input.LT(-1),"!");
+ factory.set(current, "em", input.LT(-1), "!", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -707,7 +707,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars
}
try {
- factory.add(current, "name", lv_name,"ID");
+ factory.add(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g
index a29ac3a..0daf22a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g
@@ -86,7 +86,7 @@ ruleOp returns [EObject current=null]
((
{
temp=factory.create("Op");
- factory.add(temp, "values",$current);
+ factory.add(temp, "values", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -103,17 +103,17 @@ ruleOp returns [EObject current=null]
}
lv_values=ruleTerm
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "values", lv_values,"Term");
+ factory.add($current, "values", lv_values, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*);
@@ -235,7 +235,7 @@ ruleAtom returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -290,7 +290,7 @@ ruleParens returns [EObject current=null]
}
try {
- factory.set($current, "em", input.LT(-1),"!");
+ factory.set($current, "em", input.LT(-1), "!", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -328,7 +328,7 @@ ruleTwoNumbers returns [EObject current=null]
}
try {
- factory.set($current, "num1", lv_num1,"INT");
+ factory.set($current, "num1", lv_num1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -348,7 +348,7 @@ ruleTwoNumbers returns [EObject current=null]
}
try {
- factory.set($current, "num2", lv_num2,"INT");
+ factory.set($current, "num2", lv_num2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -372,7 +372,7 @@ ruleTwoNumbers returns [EObject current=null]
}
try {
- factory.add($current, "num3", lv_num3,"INT");
+ factory.add($current, "num3", lv_num3, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -414,7 +414,7 @@ ruleManyStrings returns [EObject current=null]
}
try {
- factory.add($current, "str1", lv_str1,"STRING");
+ factory.add($current, "str1", lv_str1, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -434,7 +434,7 @@ ruleManyStrings returns [EObject current=null]
}
try {
- factory.add($current, "str2", lv_str2,"STRING");
+ factory.add($current, "str2", lv_str2, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -476,7 +476,7 @@ ruleType returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -547,7 +547,7 @@ ruleRef2 returns [EObject current=null]
}
try {
- factory.set($current, "ref2", input.LT(-1),null);
+ factory.set($current, "ref2", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -589,7 +589,7 @@ ruleSpare returns [EObject current=null]
}
try {
- factory.add($current, "id", lv_id,"ID");
+ factory.add($current, "id", lv_id, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -613,7 +613,7 @@ ruleSpare returns [EObject current=null]
}
try {
- factory.add($current, "id", lv_id,"ID");
+ factory.add($current, "id", lv_id, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
index 3f6e5a1..37674d0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-19 13:25:13
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2009-01-04 17:07:27
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
index 73c17be..cce86df 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-19 13:25:13
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2009-01-04 17:07:27
package org.eclipse.xtext.parsetree.reconstr.parser.internal;
@@ -147,7 +147,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
{
temp=factory.create("Op");
- factory.add(temp, "values",current);
+ factory.add(temp, "values", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -170,17 +170,17 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Expression");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "values", lv_values,"Term");
+ factory.add(current, "values", lv_values, "Term", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -622,7 +622,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -753,7 +753,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "em", input.LT(-1),"!");
+ factory.set(current, "em", input.LT(-1), "!", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -854,7 +854,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "num1", lv_num1,"INT");
+ factory.set(current, "num1", lv_num1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -877,7 +877,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "num2", lv_num2,"INT");
+ factory.set(current, "num2", lv_num2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -922,7 +922,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.add(current, "num3", lv_num3,"INT");
+ factory.add(current, "num3", lv_num3, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1050,7 +1050,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.add(current, "str1", lv_str1,"STRING");
+ factory.add(current, "str1", lv_str1, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1082,7 +1082,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.add(current, "str2", lv_str2,"STRING");
+ factory.add(current, "str2", lv_str2, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1185,7 +1185,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1385,7 +1385,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.set(current, "ref2", input.LT(-1),null);
+ factory.set(current, "ref2", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1485,7 +1485,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.add(current, "id", lv_id,"ID");
+ factory.add(current, "id", lv_id, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1530,7 +1530,7 @@ public class InternalSimpleReconstrTestLanguageParser extends AbstractAntlrParse
}
try {
- factory.add(current, "id", lv_id,"ID");
+ factory.add(current, "id", lv_id, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi
index 344d363..c98c9e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.xmi
@@ -6,7 +6,9 @@
<idElements>parsetree</idElements>
<idElements>transientvalues</idElements>
<idElements>TransientValuesTest</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="transientvaluestest" nsURI="http://simple/transientvaluestest"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="transientvaluestest">
+ <ePackage href="http://simple/transientvaluestest#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Root">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://simple/transientvaluestest#//Root"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g
index 6f7e97c..b939c84 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g
@@ -143,7 +143,7 @@ ruleTestRequired returns [EObject current=null]
}
try {
- factory.set($current, "required1", lv_required1,"INT");
+ factory.set($current, "required1", lv_required1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -163,7 +163,7 @@ ruleTestRequired returns [EObject current=null]
}
try {
- factory.set($current, "required2", lv_required2,"INT");
+ factory.set($current, "required2", lv_required2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -205,7 +205,7 @@ ruleTestOptional returns [EObject current=null]
}
try {
- factory.set($current, "opt1", lv_opt1,"INT");
+ factory.set($current, "opt1", lv_opt1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -229,7 +229,7 @@ ruleTestOptional returns [EObject current=null]
}
try {
- factory.set($current, "opt2", lv_opt2,"INT");
+ factory.set($current, "opt2", lv_opt2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -271,7 +271,7 @@ ruleTestList returns [EObject current=null]
}
try {
- factory.add($current, "item", lv_item,"INT");
+ factory.add($current, "item", lv_item, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
index 336805c..4643662 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-19 13:25:22
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2009-01-04 17:07:35
package org.eclipse.xtext.parsetree.transientvalues.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
index ed2976a..21e8adc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-19 13:25:21
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2009-01-04 17:07:35
package org.eclipse.xtext.parsetree.transientvalues.parser.internal;
@@ -312,7 +312,7 @@ public class InternalTransientValuesTestParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "required1", lv_required1,"INT");
+ factory.set(current, "required1", lv_required1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -338,7 +338,7 @@ public class InternalTransientValuesTestParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "required2", lv_required2,"INT");
+ factory.set(current, "required2", lv_required2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -447,7 +447,7 @@ public class InternalTransientValuesTestParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "opt1", lv_opt1,"INT");
+ factory.set(current, "opt1", lv_opt1, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -491,7 +491,7 @@ public class InternalTransientValuesTestParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "opt2", lv_opt2,"INT");
+ factory.set(current, "opt2", lv_opt2, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -606,7 +606,7 @@ public class InternalTransientValuesTestParser extends AbstractAntlrParser {
}
try {
- factory.add(current, "item", lv_item,"INT");
+ factory.add(current, "item", lv_item, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi
index cec7c4e..c340049 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/MultiValueFeatureTestLanguage.xmi
@@ -6,7 +6,9 @@
<idElements>resource</idElements>
<idElements>metamodel</idElements>
<idElements>MultiValueFeatureTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="MultiValueFeatureTestLanguage" nsURI="http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="MultiValueFeatureTestLanguage">
+ <ePackage href="http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Start">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage#//Start"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g
index ee9612e..08f2cb1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g
@@ -88,7 +88,7 @@ ruleStart returns [EObject current=null]
}
try {
- factory.add($current, "featureA", lv_featureA,"ID");
+ factory.add($current, "featureA", lv_featureA, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageLexer.java
index 821f838..7556506 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g 2008-12-19 13:25:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g 2009-01-04 17:07:36
package org.eclipse.xtext.resource.metamodel.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageParser.java
index 432ca57..ba7e63d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g 2008-12-19 13:25:23
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/resource/metamodel/parser/internal/InternalMultiValueFeatureTestLanguage.g 2009-01-04 17:07:36
package org.eclipse.xtext.resource.metamodel.parser.internal;
@@ -138,7 +138,7 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractAntlrPa
}
try {
- factory.add(current, "featureA", lv_featureA,"ID");
+ factory.add(current, "featureA", lv_featureA, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
index 156bc39..13a5bc6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>ActionTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ActionLang" nsURI="http://www.eclipse.org/2008/tmf/xtext/ActionLang"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ActionLang">
+ <ePackage href="http://www.eclipse.org/2008/tmf/xtext/ActionLang#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Model">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/ActionLang#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
index 43d97bf..9464093 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>ContentAssistTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="contentAssistTestLanguage" nsURI="http://www.eclipse.org/2008/xtext/tests/ContentAssist"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="contentAssistTestLanguage">
+ <ePackage href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Start">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/tests/ContentAssist#//Start"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
index 220c78b..e4756e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>FowlerDslTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl" nsURI="http://example.xtext.org/FowlerDslTestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="fowlerdsl">
+ <ePackage href="http://example.xtext.org/FowlerDslTestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Statemachine">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://example.xtext.org/FowlerDslTestLanguage#//Statemachine"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi
index e4595f8..5f94283 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>LexerTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LexerLang" nsURI="http://www.eclipse.org/2008/xtext/LexerLang"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LexerLang">
+ <ePackage href="http://www.eclipse.org/2008/xtext/LexerLang#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Model">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/LexerLang#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi
index ebc9d77..5dee9c6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>LookaheadTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LookaheadLang" nsURI="http://www.eclipse.org/2008/xtext/LookaheadLang"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="LookaheadLang">
+ <ePackage href="http://www.eclipse.org/2008/xtext/LookaheadLang#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Entry">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/LookaheadLang#//Entry"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi
index 3b7ee28..1dc2580 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>OptionalEmptyTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="OptionalEmpty" nsURI="http://www.eclipse.org/2008/tmf/xtext/OptionalEmpty"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="OptionalEmpty">
+ <ePackage href="http://www.eclipse.org/2008/tmf/xtext/OptionalEmpty#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Model">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/OptionalEmpty#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
index 6a0cf21..60f1f21 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>PartialParserTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="partialParserTestLanguage" nsURI="http://example.xtext.org/PartialParserTestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="partialParserTestLanguage">
+ <ePackage href="http://example.xtext.org/PartialParserTestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Container">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://example.xtext.org/PartialParserTestLanguage#//Container"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi
index 0b6c742..3374af4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>ReferenceGrammarTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar" nsURI="http://eclipse.org/xtext/reference/ReferenceGrammar"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="ReferenceGrammar">
+ <ePackage href="http://eclipse.org/xtext/reference/ReferenceGrammar#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Spielplatz">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://eclipse.org/xtext/reference/ReferenceGrammar#//Spielplatz"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi
index 3f39cfd..e557928 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>SimpleExpressionsTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simpleExpressions" nsURI="http://www.eclipse.org/xtext/test/simpleExpressions"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="simpleExpressions">
+ <ePackage href="http://www.eclipse.org/xtext/test/simpleExpressions#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Sequence">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/xtext/test/simpleExpressions#//Sequence"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
index 2bd34ce..6d3a818 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>TestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TestLang" nsURI="http://www.eclipse.org/2008/xtext/TestLang"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TestLang">
+ <ePackage href="http://www.eclipse.org/2008/xtext/TestLang#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="EntryRule">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/xtext/TestLang#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi
index 7f0999f..42f97fc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.xmi
@@ -5,7 +5,9 @@
<idElements>xtext</idElements>
<idElements>testlanguages</idElements>
<idElements>TreeTestLanguage</idElements>
- <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TreeTestLanguage" nsURI="http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage"/>
+ <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="TreeTestLanguage">
+ <ePackage href="http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage#/"/>
+ </metamodelDeclarations>
<rules xsi:type="xtext:ParserRule" name="Model">
<type metamodel="//@metamodelDeclarations.0">
<type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage#//Model"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g
index 474781b..44e2d26 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g
@@ -82,17 +82,17 @@ ruleModel returns [EObject current=null]
}
lv_children=ruleElement
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "children", lv_children,"Element");
+ factory.add($current, "children", lv_children, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*;
@@ -125,7 +125,7 @@ ruleElement returns [EObject current=null]
((
{
temp=factory.create("Item");
- factory.add(temp, "items",$current);
+ factory.add(temp, "items", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -142,17 +142,17 @@ ruleElement returns [EObject current=null]
}
lv_items=ruleItem
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Type");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "items", lv_items,"Item");
+ factory.add($current, "items", lv_items, "Item", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)));
@@ -176,7 +176,7 @@ ruleItem returns [EObject current=null]
((
{
temp=factory.create("Thing");
- factory.set(temp, "content",$current);
+ factory.set(temp, "content", $current, null /*ParserRule*/, currentNode);
$current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -199,7 +199,7 @@ ruleItem returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
index fb80a3c..0d90e50 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-19 13:25:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2009-01-04 17:07:29
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
index 5fa5213..8969607 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-19 13:25:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2009-01-04 17:07:29
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -134,17 +134,17 @@ public class InternalActionTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "children", lv_children,"Element");
+ factory.add(current, "children", lv_children, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -244,7 +244,7 @@ public class InternalActionTestLanguageParser extends AbstractAntlrParser {
{
temp=factory.create("Item");
- factory.add(temp, "items",current);
+ factory.add(temp, "items", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -267,17 +267,17 @@ public class InternalActionTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Type");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "items", lv_items,"Item");
+ factory.add(current, "items", lv_items, "Item", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -360,7 +360,7 @@ public class InternalActionTestLanguageParser extends AbstractAntlrParser {
{
temp=factory.create("Thing");
- factory.set(temp, "content",current);
+ factory.set(temp, "content", current, null /*ParserRule*/, currentNode);
current = temp;
temp = null;
CompositeNode newNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ActionTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0" /* xtext::Action */, currentNode.getParent());
@@ -387,7 +387,7 @@ public class InternalActionTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g
index 952aa6e..f401832 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g
@@ -86,17 +86,17 @@ ruleStart returns [EObject current=null]
}
lv_rules=ruleAbstractRule
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Start");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "rules", lv_rules,"AbstractRule");
+ factory.add($current, "rules", lv_rules, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+)'end'
@@ -172,7 +172,7 @@ ruleFirstAbstractRuleChild returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -190,17 +190,17 @@ ruleFirstAbstractRuleChild returns [EObject current=null]
}
lv_elements=ruleAbstractRule
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("FirstAbstractRuleChild");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "elements", lv_elements,"AbstractRule");
+ factory.add($current, "elements", lv_elements, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+)')'
@@ -243,7 +243,7 @@ ruleSecondAbstractRuleChild returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -265,17 +265,17 @@ ruleSecondAbstractRuleChild returns [EObject current=null]
}
lv_rule=ruleAbstractRuleCall
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("SecondAbstractRuleChild");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "rule", lv_rule,"AbstractRuleCall");
+ factory.set($current, "rule", lv_rule, "AbstractRuleCall", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))';'
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
index b911fee..d03b35e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-19 13:25:21
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2009-01-04 17:09:35
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -33,14 +33,14 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public InternalContentAssistTestLanguageLexer(CharStream input) {
super(input);
}
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g"; }
// $ANTLR start T11
public final void mT11() throws RecognitionException {
try {
int _type = T11;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:10:5: ( 'abstract rules' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:10:7: 'abstract rules'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:10:5: ( 'abstract rules' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:10:7: 'abstract rules'
{
match("abstract rules");
@@ -58,8 +58,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:11:5: ( 'end' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:11:7: 'end'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:11:5: ( 'end' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:11:7: 'end'
{
match("end");
@@ -77,8 +77,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT13() throws RecognitionException {
try {
int _type = T13;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:12:5: ( '(' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:12:7: '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:12:5: ( '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:12:7: '('
{
match('(');
@@ -95,8 +95,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:13:5: ( ')' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:13:7: ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:13:5: ( ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:13:7: ')'
{
match(')');
@@ -113,8 +113,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:14:5: ( ';' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:14:7: ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:14:5: ( ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:14:7: ';'
{
match(';');
@@ -131,8 +131,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT16() throws RecognitionException {
try {
int _type = T16;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:15:5: ( 'rule' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:15:7: 'rule'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:15:5: ( 'rule' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:15:7: 'rule'
{
match("rule");
@@ -150,8 +150,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mT17() throws RecognitionException {
try {
int _type = T17;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:16:5: ( ':' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:16:7: ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:16:5: ( ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:16:7: ':'
{
match(':');
@@ -168,10 +168,10 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:11: ( '^' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -180,7 +180,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:12: '^'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:12: '^'
{
match('^');
@@ -199,7 +199,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:324:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -212,7 +212,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.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();
@@ -247,10 +247,10 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:10: ( ( '0' .. '9' )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:12: ( '0' .. '9' )+
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -264,7 +264,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:13: '0' .. '9'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:326:13: '0' .. '9'
{
matchRange('0','9');
@@ -294,7 +294,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -312,10 +312,10 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
{
match('\"');
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
loop4:
do {
int alt4=3;
@@ -331,7 +331,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328: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' ) {
@@ -348,7 +348,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:65: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:65: ~ ( '\\\\' | '\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -374,10 +374,10 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
loop5:
do {
int alt5=3;
@@ -393,7 +393,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328: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' ) {
@@ -410,7 +410,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:152: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:328:152: ~ ( '\\\\' | '\\'' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -448,12 +448,12 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -478,7 +478,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:52: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:330:52: .
{
matchAny();
@@ -507,12 +507,12 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:24: (~ ( '\\n' | '\\r' ) )*
loop8:
do {
int alt8=2;
@@ -525,7 +525,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332: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();
@@ -546,7 +546,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:38: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -555,9 +555,9 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: ( '\\r' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -566,7 +566,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: '\\r'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:332:39: '\\r'
{
match('\r');
@@ -597,10 +597,10 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:334:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -614,7 +614,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -654,8 +654,8 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:336:16: ( . )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:336:18: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:336:16: ( . )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:336:18: .
{
matchAny();
@@ -669,7 +669,7 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=14;
int LA12_0 = input.LA(1);
@@ -847,98 +847,98 @@ public class InternalContentAssistTestLanguageLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:10: T11
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:10: T11
{
mT11();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:14: T12
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:14: T12
{
mT12();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:18: T13
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:18: T13
{
mT13();
}
break;
case 4 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:22: T14
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:22: T14
{
mT14();
}
break;
case 5 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:26: T15
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:26: T15
{
mT15();
}
break;
case 6 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:30: T16
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:30: T16
{
mT16();
}
break;
case 7 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:34: T17
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:34: T17
{
mT17();
}
break;
case 8 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:38: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:38: RULE_ID
{
mRULE_ID();
}
break;
case 9 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:46: RULE_INT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:46: RULE_INT
{
mRULE_INT();
}
break;
case 10 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:55: RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:55: RULE_STRING
{
mRULE_STRING();
}
break;
case 11 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:67: RULE_ML_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:67: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 12 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:83: RULE_SL_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:83: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 13 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:99: RULE_WS
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:99: RULE_WS
{
mRULE_WS();
}
break;
case 14 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:107: RULE_ANY_OTHER
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:1:107: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
index 5e90a35..669e4bb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-19 13:25:21
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2009-01-04 17:09:34
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -40,7 +40,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
public String[] getTokenNames() { return tokenNames; }
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g"; }
@@ -64,7 +64,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleStart
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:66:1: entryRuleStart returns [EObject current=null] : iv_ruleStart= ruleStart EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:66:1: entryRuleStart returns [EObject current=null] : iv_ruleStart= ruleStart EOF ;
public final EObject entryRuleStart() throws RecognitionException {
EObject current = null;
@@ -72,8 +72,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:66:47: (iv_ruleStart= ruleStart EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:67:2: iv_ruleStart= ruleStart EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:66:47: (iv_ruleStart= ruleStart EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:67:2: iv_ruleStart= ruleStart EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleStart_in_entryRuleStart71);
@@ -99,7 +99,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleStart
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:74:1: ruleStart returns [EObject current=null] : ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:74:1: ruleStart returns [EObject current=null] : ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' ) ;
public final EObject ruleStart() throws RecognitionException {
EObject current = null;
@@ -108,20 +108,20 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:76:33: ( ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:1: ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:76:33: ( ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:1: ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:1: ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:2: ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:1: ( ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:2: ( 'abstract rules' (lv_rules= ruleAbstractRule )+ ) 'end'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:2: ( 'abstract rules' (lv_rules= ruleAbstractRule )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:3: 'abstract rules' (lv_rules= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:2: ( 'abstract rules' (lv_rules= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:77:3: 'abstract rules' (lv_rules= ruleAbstractRule )+
{
match(input,11,FOLLOW_11_in_ruleStart116);
createLeafNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:81:1: (lv_rules= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:81:1: (lv_rules= ruleAbstractRule )+
int cnt1=0;
loop1:
do {
@@ -135,7 +135,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:84:6: lv_rules= ruleAbstractRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:84:6: lv_rules= ruleAbstractRule
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -145,17 +145,17 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Start");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "rules", lv_rules,"AbstractRule");
+ factory.add(current, "rules", lv_rules, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -198,7 +198,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractRule
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:113:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:113:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ;
public final EObject entryRuleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -206,8 +206,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:113:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:114:2: iv_ruleAbstractRule= ruleAbstractRule EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:113:54: (iv_ruleAbstractRule= ruleAbstractRule EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:114:2: iv_ruleAbstractRule= ruleAbstractRule EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule198);
@@ -233,7 +233,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractRule
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:121:1: ruleAbstractRule returns [EObject current=null] : (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:121:1: ruleAbstractRule returns [EObject current=null] : (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild ) ;
public final EObject ruleAbstractRule() throws RecognitionException {
EObject current = null;
@@ -244,10 +244,10 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:123:33: ( (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:124:1: (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:123:33: ( (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:124:1: (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:124:1: (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:124:1: (this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild | this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -275,7 +275,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:125:5: this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:125:5: this_FirstAbstractRuleChild= ruleFirstAbstractRuleChild
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.1/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode);
@@ -292,7 +292,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:135:5: this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:135:5: this_SecondAbstractRuleChild= ruleSecondAbstractRuleChild
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.1/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode);
@@ -329,7 +329,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleFirstAbstractRuleChild
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:150:1: entryRuleFirstAbstractRuleChild returns [EObject current=null] : iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:150:1: entryRuleFirstAbstractRuleChild returns [EObject current=null] : iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF ;
public final EObject entryRuleFirstAbstractRuleChild() throws RecognitionException {
EObject current = null;
@@ -337,8 +337,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:150:64: (iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:151:2: iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:150:64: (iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:151:2: iv_ruleFirstAbstractRuleChild= ruleFirstAbstractRuleChild EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleFirstAbstractRuleChild_in_entryRuleFirstAbstractRuleChild314);
@@ -364,7 +364,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleFirstAbstractRuleChild
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:158:1: ruleFirstAbstractRuleChild returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:158:1: ruleFirstAbstractRuleChild returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' ) ;
public final EObject ruleFirstAbstractRuleChild() throws RecognitionException {
EObject current = null;
@@ -374,23 +374,23 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:160:33: ( ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:1: ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:160:33: ( ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:1: ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:1: ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:2: ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:1: ( ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:2: ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' ) ';'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:2: ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:3: ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:2: ( ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:3: ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ ) ')'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:3: ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:4: ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:3: ( ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:4: ( (lv_name= RULE_ID ) '(' ) (lv_elements= ruleAbstractRule )+
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:4: ( (lv_name= RULE_ID ) '(' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:5: (lv_name= RULE_ID ) '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:4: ( (lv_name= RULE_ID ) '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:5: (lv_name= RULE_ID ) '('
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:5: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:163:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:161:5: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:163:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFirstAbstractRuleChild373);
@@ -404,7 +404,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -419,7 +419,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:185:2: (lv_elements= ruleAbstractRule )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:185:2: (lv_elements= ruleAbstractRule )+
int cnt3=0;
loop3:
do {
@@ -433,7 +433,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:188:6: lv_elements= ruleAbstractRule
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:188:6: lv_elements= ruleAbstractRule
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -443,17 +443,17 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("FirstAbstractRuleChild");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "elements", lv_elements,"AbstractRule");
+ factory.add(current, "elements", lv_elements, "AbstractRule", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -503,7 +503,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleSecondAbstractRuleChild
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:221:1: entryRuleSecondAbstractRuleChild returns [EObject current=null] : iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:221:1: entryRuleSecondAbstractRuleChild returns [EObject current=null] : iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF ;
public final EObject entryRuleSecondAbstractRuleChild() throws RecognitionException {
EObject current = null;
@@ -511,8 +511,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:221:65: (iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:222:2: iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:221:65: (iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:222:2: iv_ruleSecondAbstractRuleChild= ruleSecondAbstractRuleChild EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleSecondAbstractRuleChild_in_entryRuleSecondAbstractRuleChild486);
@@ -538,7 +538,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleSecondAbstractRuleChild
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:229:1: ruleSecondAbstractRuleChild returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:229:1: ruleSecondAbstractRuleChild returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' ) ;
public final EObject ruleSecondAbstractRuleChild() throws RecognitionException {
EObject current = null;
@@ -548,23 +548,23 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:231:33: ( ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:1: ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:231:33: ( ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:1: ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:1: ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:2: ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:1: ( ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:2: ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) ) ';'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:2: ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:3: ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:2: ( ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:3: ( ( (lv_name= RULE_ID ) 'rule' ) ':' ) (lv_rule= ruleAbstractRuleCall )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:3: ( ( (lv_name= RULE_ID ) 'rule' ) ':' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:4: ( (lv_name= RULE_ID ) 'rule' ) ':'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:3: ( ( (lv_name= RULE_ID ) 'rule' ) ':' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:4: ( (lv_name= RULE_ID ) 'rule' ) ':'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:4: ( (lv_name= RULE_ID ) 'rule' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:5: (lv_name= RULE_ID ) 'rule'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:4: ( (lv_name= RULE_ID ) 'rule' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:5: (lv_name= RULE_ID ) 'rule'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:5: (lv_name= RULE_ID )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:234:6: lv_name= RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:232:5: (lv_name= RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:234:6: lv_name= RULE_ID
{
lv_name=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSecondAbstractRuleChild545);
@@ -578,7 +578,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -600,8 +600,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:260:2: (lv_rule= ruleAbstractRuleCall )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:263:6: lv_rule= ruleAbstractRuleCall
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:260:2: (lv_rule= ruleAbstractRuleCall )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:263:6: lv_rule= ruleAbstractRuleCall
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode);
@@ -611,17 +611,17 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("SecondAbstractRuleChild");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "rule", lv_rule,"AbstractRuleCall");
+ factory.set(current, "rule", lv_rule, "AbstractRuleCall", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -654,7 +654,7 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start entryRuleAbstractRuleCall
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:292:1: entryRuleAbstractRuleCall returns [EObject current=null] : iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:292:1: entryRuleAbstractRuleCall returns [EObject current=null] : iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF ;
public final EObject entryRuleAbstractRuleCall() throws RecognitionException {
EObject current = null;
@@ -662,8 +662,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:292:58: (iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:293:2: iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:292:58: (iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:293:2: iv_ruleAbstractRuleCall= ruleAbstractRuleCall EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleAbstractRuleCall_in_entryRuleAbstractRuleCall657);
@@ -689,17 +689,17 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
// $ANTLR start ruleAbstractRuleCall
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:300:1: ruleAbstractRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:300:1: ruleAbstractRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ;
public final EObject ruleAbstractRuleCall() throws RecognitionException {
EObject current = null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:302:33: ( ( ( RULE_ID ) ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:303:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:302:33: ( ( ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:303:1: ( ( RULE_ID ) )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:303:1: ( ( RULE_ID ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:306:3: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:303:1: ( ( RULE_ID ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:306:3: ( RULE_ID )
{
if (current==null) {
@@ -707,8 +707,8 @@ public class InternalContentAssistTestLanguageParser extends AbstractAntlrParser
associateNodeWithAstElement(currentNode, current);
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:312:1: ( RULE_ID )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:313:2: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:312:1: ( RULE_ID )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g:313:2: RULE_ID
{
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAbstractRuleCall715);
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage__.g
index e57ec69..dab44c8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage__.g
@@ -15,25 +15,25 @@ T15 : ';' ;
T16 : 'rule' ;
T17 : ':' ;
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 324
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 324
RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 326
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 326
RULE_INT : ('0'..'9')+;
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 328
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 328
RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 330
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 330
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 332
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 332
RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 334
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 334
RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
-// $ANTLR src "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 336
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g" 336
RULE_ANY_OTHER : .;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g
index 481fbd2..085c7db 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g
@@ -86,17 +86,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_events=ruleEvent
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "events", lv_events,"Event");
+ factory.add($current, "events", lv_events, "Event", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
@@ -115,17 +115,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_commands=ruleCommand
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "commands", lv_commands,"Command");
+ factory.add($current, "commands", lv_commands, "Command", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
@@ -140,17 +140,17 @@ ruleStatemachine returns [EObject current=null]
}
lv_states=ruleState
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "states", lv_states,"State");
+ factory.add($current, "states", lv_states, "State", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*);
@@ -185,7 +185,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "resetting", true,"resetting");
+ factory.set($current, "resetting", true, "resetting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -205,7 +205,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -225,7 +225,7 @@ ruleEvent returns [EObject current=null]
}
try {
- factory.set($current, "code", lv_code,"ID");
+ factory.set($current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -263,7 +263,7 @@ ruleCommand returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -283,7 +283,7 @@ ruleCommand returns [EObject current=null]
}
try {
- factory.set($current, "code", lv_code,"ID");
+ factory.set($current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -325,7 +325,7 @@ ruleState returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -366,17 +366,17 @@ ruleState returns [EObject current=null]
}
lv_transitions=ruleTransition
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("State");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "transitions", lv_transitions,"Transition");
+ factory.add($current, "transitions", lv_transitions, "Transition", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*)'end'
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
index dfcd524..b9bdc23 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-19 13:25:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2009-01-04 17:07:32
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
index 955aa18..fcf07ac 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-19 13:25:19
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2009-01-04 17:07:32
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -160,17 +160,17 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "events", lv_events,"Event");
+ factory.add(current, "events", lv_events, "Event", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -221,17 +221,17 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "commands", lv_commands,"Command");
+ factory.add(current, "commands", lv_commands, "Command", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -275,17 +275,17 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Statemachine");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "states", lv_states,"State");
+ factory.add(current, "states", lv_states, "State", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -394,7 +394,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "resetting", true,"resetting");
+ factory.set(current, "resetting", true, "resetting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -420,7 +420,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -446,7 +446,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "code", lv_code,"ID");
+ factory.set(current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -540,7 +540,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -563,7 +563,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "code", lv_code,"ID");
+ factory.set(current, "code", lv_code, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -671,7 +671,7 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -794,17 +794,17 @@ public class InternalFowlerDslTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("State");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "transitions", lv_transitions,"Transition");
+ factory.add(current, "transitions", lv_transitions, "Transition", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g
index 8ea18bc..6ce28fd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g
@@ -82,17 +82,17 @@ ruleModel returns [EObject current=null]
}
lv_children=ruleElement
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "children", lv_children,"Element");
+ factory.add($current, "children", lv_children, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*;
@@ -127,7 +127,7 @@ ruleElement returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -147,7 +147,7 @@ ruleElement returns [EObject current=null]
}
try {
- factory.set($current, "h", lv_h,"STRING");
+ factory.set($current, "h", lv_h, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
index 81f52ea..16810e1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-19 13:25:15
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2009-01-04 17:07:28
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
index 33654fe..2cf32fb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-19 13:25:15
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2009-01-04 17:07:28
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -134,17 +134,17 @@ public class InternalLexerTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "children", lv_children,"Element");
+ factory.add(current, "children", lv_children, "Element", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -238,7 +238,7 @@ public class InternalLexerTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -261,7 +261,7 @@ public class InternalLexerTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "h", lv_h,"STRING");
+ factory.set(current, "h", lv_h, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g
index f67c0d9..e44153b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g
@@ -82,17 +82,17 @@ ruleEntry returns [EObject current=null]
}
lv_contents=ruleAlts
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Entry");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "contents", lv_contents,"Alts");
+ factory.add($current, "contents", lv_contents, "Alts", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)*;
@@ -178,7 +178,7 @@ ruleLookAhead0 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"a");
+ factory.set($current, "x", input.LT(-1), "a", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -214,17 +214,17 @@ ruleLookAhead1 returns [EObject current=null]
}
lv_y=ruleLookAhead2
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("LookAhead1");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "y", lv_y,"LookAhead2");
+ factory.set($current, "y", lv_y, "LookAhead2", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))(
@@ -241,7 +241,7 @@ ruleLookAhead1 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"b");
+ factory.set($current, "x", input.LT(-1), "b", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -261,7 +261,7 @@ ruleLookAhead1 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"d");
+ factory.set($current, "x", input.LT(-1), "d", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -299,7 +299,7 @@ ruleLookAhead2 returns [EObject current=null]
}
try {
- factory.set($current, "z", input.LT(-1),"foo");
+ factory.set($current, "z", input.LT(-1), "foo", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -320,7 +320,7 @@ ruleLookAhead2 returns [EObject current=null]
}
try {
- factory.set($current, "z", input.LT(-1),"bar");
+ factory.set($current, "z", input.LT(-1), "bar", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -370,7 +370,7 @@ ruleLookAhead3 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"b");
+ factory.set($current, "x", input.LT(-1), "b", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -384,17 +384,17 @@ ruleLookAhead3 returns [EObject current=null]
}
lv_z=ruleLookAhead4
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("LookAhead3");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "z", lv_z,"LookAhead4");
+ factory.set($current, "z", lv_z, "LookAhead4", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
));
@@ -429,7 +429,7 @@ ruleLookAhead4 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"c");
+ factory.set($current, "x", input.LT(-1), "c", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -450,7 +450,7 @@ ruleLookAhead4 returns [EObject current=null]
}
try {
- factory.set($current, "x", input.LT(-1),"d");
+ factory.set($current, "x", input.LT(-1), "d", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
index e41b028..3621833 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-19 13:25:18
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2009-01-04 17:07:31
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
index 08b771a..9ecbedc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-19 13:25:18
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2009-01-04 17:07:31
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -134,17 +134,17 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Entry");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "contents", lv_contents,"Alts");
+ factory.add(current, "contents", lv_contents, "Alts", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -433,7 +433,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"a");
+ factory.set(current, "x", input.LT(-1), "a", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -534,17 +534,17 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("LookAhead1");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "y", lv_y,"LookAhead2");
+ factory.set(current, "y", lv_y, "LookAhead2", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -567,7 +567,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"b");
+ factory.set(current, "x", input.LT(-1), "b", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -593,7 +593,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"d");
+ factory.set(current, "x", input.LT(-1), "d", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -706,7 +706,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "z", input.LT(-1),"foo");
+ factory.set(current, "z", input.LT(-1), "foo", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -735,7 +735,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "z", input.LT(-1),"bar");
+ factory.set(current, "z", input.LT(-1), "bar", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -857,7 +857,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"b");
+ factory.set(current, "x", input.LT(-1), "b", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -879,17 +879,17 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("LookAhead3");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "z", lv_z,"LookAhead4");
+ factory.set(current, "z", lv_z, "LookAhead4", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -996,7 +996,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"c");
+ factory.set(current, "x", input.LT(-1), "c", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -1025,7 +1025,7 @@ public class InternalLookaheadTestLanguageParser extends AbstractAntlrParser {
}
try {
- factory.set(current, "x", input.LT(-1),"d");
+ factory.set(current, "x", input.LT(-1), "d", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g
index 4608a38..8e73e94 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g
@@ -82,17 +82,17 @@ ruleModel returns [EObject current=null]
}
lv_child=ruleGreeting
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Model");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "child", lv_child,"Greeting");
+ factory.set($current, "child", lv_child, "Greeting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)?;
@@ -131,7 +131,7 @@ ruleGreeting returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
index 2d5a568..beaba63 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-19 13:25:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2009-01-04 17:07:30
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
index 7e57f74..a6cb666 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-19 13:25:16
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2009-01-04 17:07:30
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -130,17 +130,17 @@ public class InternalOptionalEmptyTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Model");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "child", lv_child,"Greeting");
+ factory.set(current, "child", lv_child, "Greeting", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -234,7 +234,7 @@ public class InternalOptionalEmptyTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g
index ddb1527..6314e59 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g
@@ -92,7 +92,7 @@ ruleContainer returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -110,17 +110,17 @@ ruleContainer returns [EObject current=null]
}
lv_nested=ruleNested
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Container");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "nested", lv_nested,"Nested");
+ factory.add($current, "nested", lv_nested, "Nested", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)
@@ -132,17 +132,17 @@ ruleContainer returns [EObject current=null]
}
lv_content=ruleContent
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Container");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "content", lv_content,"Content");
+ factory.add($current, "content", lv_content, "Content", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*)'}'
@@ -183,17 +183,17 @@ ruleNested returns [EObject current=null]
}
lv_nested=ruleContainer
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Nested");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "nested", lv_nested,"Container");
+ factory.add($current, "nested", lv_nested, "Container", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+)'}'
@@ -271,17 +271,17 @@ ruleChildren returns [EObject current=null]
}
lv_children=ruleChild
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Children");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "children", lv_children,"Child");
+ factory.add($current, "children", lv_children, "Child", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))(','
@@ -296,17 +296,17 @@ ruleChildren returns [EObject current=null]
}
lv_children=ruleChild
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Children");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "children", lv_children,"Child");
+ factory.add($current, "children", lv_children, "Child", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*)'}'
@@ -351,17 +351,17 @@ ruleChild returns [EObject current=null]
}
lv_value=ruleNamed
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Child");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "value", lv_value,"Named");
+ factory.set($current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))')'
@@ -402,17 +402,17 @@ ruleAbstractChildren returns [EObject current=null]
}
lv_abstractChildren=ruleAbstractChild
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("AbstractChildren");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "abstractChildren", lv_abstractChildren,"AbstractChild");
+ factory.add($current, "abstractChildren", lv_abstractChildren, "AbstractChild", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)+)'}'
@@ -494,17 +494,17 @@ ruleFirstConcrete returns [EObject current=null]
}
lv_value=ruleNamed
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("FirstConcrete");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "value", lv_value,"Named");
+ factory.set($current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))(
@@ -568,17 +568,17 @@ ruleSecondConcrete returns [EObject current=null]
}
lv_value=ruleNamed
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("SecondConcrete");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "value", lv_value,"Named");
+ factory.set($current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))(
@@ -632,7 +632,7 @@ ruleNamed returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
index ca7edf0..bea5f48 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-19 13:25:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2009-01-04 17:07:34
package org.eclipse.xtext.testlanguages.parser.internal;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
index a5ccaa1..f12e4ba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-19 13:25:20
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2009-01-04 17:07:34
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -145,7 +145,7 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -192,17 +192,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Container");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "nested", lv_nested,"Nested");
+ factory.add(current, "nested", lv_nested, "Nested", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -224,17 +224,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Container");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "content", lv_content,"Content");
+ factory.add(current, "content", lv_content, "Content", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -367,17 +367,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Nested");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "nested", lv_nested,"Container");
+ factory.add(current, "nested", lv_nested, "Container", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -622,17 +622,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Children");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "children", lv_children,"Child");
+ factory.add(current, "children", lv_children, "Child", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -670,17 +670,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Children");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "children", lv_children,"Child");
+ factory.add(current, "children", lv_children, "Child", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -810,17 +810,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Child");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "value", lv_value,"Named");
+ factory.set(current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -944,17 +944,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("AbstractChildren");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "abstractChildren", lv_abstractChildren,"AbstractChild");
+ factory.add(current, "abstractChildren", lv_abstractChildren, "AbstractChild", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1229,17 +1229,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("FirstConcrete");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "value", lv_value,"Named");
+ factory.set(current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1409,17 +1409,17 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("SecondConcrete");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.set(current, "value", lv_value,"Named");
+ factory.set(current, "value", lv_value, "Named", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -1549,7 +1549,7 @@ public class InternalPartialParserTestLanguageParser extends AbstractAntlrParser
}
try {
- factory.set(current, "name", lv_name,"ID");
+ factory.set(current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g
index 09e1fc7..8e9d853 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g
@@ -92,7 +92,7 @@ ruleSpielplatz returns [EObject current=null]
}
try {
- factory.set($current, "groesse", lv_groesse,"INT");
+ factory.set($current, "groesse", lv_groesse, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -112,7 +112,7 @@ ruleSpielplatz returns [EObject current=null]
}
try {
- factory.set($current, "beschreibung", lv_beschreibung,"STRING");
+ factory.set($current, "beschreibung", lv_beschreibung, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -130,17 +130,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_kinder=ruleKind
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "kinder", lv_kinder,"Kind");
+ factory.add($current, "kinder", lv_kinder, "Kind", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
)
@@ -152,17 +152,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_erzieher=ruleErwachsener
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "erzieher", lv_erzieher,"Erwachsener");
+ factory.add($current, "erzieher", lv_erzieher, "Erwachsener", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
@@ -174,17 +174,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_spielzeuge=ruleSpielzeug
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "spielzeuge", lv_spielzeuge,"Spielzeug");
+ factory.add($current, "spielzeuge", lv_spielzeuge, "Spielzeug", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))
@@ -196,17 +196,17 @@ ruleSpielplatz returns [EObject current=null]
}
lv_familie=ruleFamilie
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.add($current, "familie", lv_familie,"Familie");
+ factory.add($current, "familie", lv_familie, "Familie", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))*)'}'
@@ -255,7 +255,7 @@ ruleKind returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -275,7 +275,7 @@ ruleKind returns [EObject current=null]
}
try {
- factory.set($current, "age", lv_age,"INT");
+ factory.set($current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -325,7 +325,7 @@ ruleErwachsener returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -345,7 +345,7 @@ ruleErwachsener returns [EObject current=null]
}
try {
- factory.set($current, "age", lv_age,"INT");
+ factory.set($current, "age", lv_age, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -395,7 +395,7 @@ ruleSpielzeug returns [EObject current=null]
}
try {
- factory.set($current, "name", lv_name,"ID");
+ factory.set($current, "name", lv_name, "ID", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -409,17 +409,17 @@ ruleSpielzeug returns [EObject current=null]
}
lv_farbe=ruleFarbe
{
- currentNode = currentNode.getParent();
if ($current==null) {
$current = factory.create("Spielzeug");
- associateNodeWithAstElement(currentNode, $current);
+ associateNodeWithAstElement(currentNode.getParent(), $current);
}
try {
- factory.set($current, "farbe", lv_farbe,"Farbe");
+ factory.set($current, "farbe", lv_farbe, "Farbe", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
))')'
@@ -513,7 +513,7 @@ ruleFamilie returns [EObject current=null]
}
try {
- factory.set($current, "name", input.LT(-1),null);
+ factory.set($current, "name", input.LT(-1), null, currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
index bf6695b..ee76400 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-19 13:25:17
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2009-01-04 17:09:31
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -41,14 +41,14 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public InternalReferenceGrammarTestLanguageLexer(CharStream input) {
super(input);
}
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g"; }
// $ANTLR start T11
public final void mT11() throws RecognitionException {
try {
int _type = T11;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:10:5: ( 'spielplatz' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:10:7: 'spielplatz'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:10:5: ( 'spielplatz' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:10:7: 'spielplatz'
{
match("spielplatz");
@@ -66,8 +66,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT12() throws RecognitionException {
try {
int _type = T12;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:11:5: ( '{' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:11:7: '{'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:11:5: ( '{' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:11:7: '{'
{
match('{');
@@ -84,8 +84,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT13() throws RecognitionException {
try {
int _type = T13;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:12:5: ( '}' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:12:7: '}'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:12:5: ( '}' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:12:7: '}'
{
match('}');
@@ -102,8 +102,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT14() throws RecognitionException {
try {
int _type = T14;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:13:5: ( 'kind' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:13:7: 'kind'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:13:5: ( 'kind' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:13:7: 'kind'
{
match("kind");
@@ -121,8 +121,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT15() throws RecognitionException {
try {
int _type = T15;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:14:5: ( '(' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:14:7: '('
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:14:5: ( '(' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:14:7: '('
{
match('(');
@@ -139,8 +139,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT16() throws RecognitionException {
try {
int _type = T16;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:15:5: ( ')' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:15:7: ')'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:15:5: ( ')' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:15:7: ')'
{
match(')');
@@ -157,8 +157,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT17() throws RecognitionException {
try {
int _type = T17;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:16:5: ( 'erwachsener' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:16:7: 'erwachsener'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:16:5: ( 'erwachsener' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:16:7: 'erwachsener'
{
match("erwachsener");
@@ -176,8 +176,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT18() throws RecognitionException {
try {
int _type = T18;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:17:5: ( 'spielzeug' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:17:7: 'spielzeug'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:17:5: ( 'spielzeug' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:17:7: 'spielzeug'
{
match("spielzeug");
@@ -195,8 +195,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT19() throws RecognitionException {
try {
int _type = T19;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:18:5: ( 'ROT' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:18:7: 'ROT'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:18:5: ( 'ROT' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:18:7: 'ROT'
{
match("ROT");
@@ -214,8 +214,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT20() throws RecognitionException {
try {
int _type = T20;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:19:5: ( 'BLAU' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:19:7: 'BLAU'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:19:5: ( 'BLAU' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:19:7: 'BLAU'
{
match("BLAU");
@@ -233,8 +233,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT21() throws RecognitionException {
try {
int _type = T21;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:20:5: ( 'GELB' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:20:7: 'GELB'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:20:5: ( 'GELB' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:20:7: 'GELB'
{
match("GELB");
@@ -252,8 +252,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT22() throws RecognitionException {
try {
int _type = T22;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GRÜN' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GRÜN'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:21:5: ( 'GRÜN' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:21:7: 'GRÜN'
{
match("GRÜN");
@@ -271,8 +271,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT23() throws RecognitionException {
try {
int _type = T23;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:22:5: ( 'familie' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:22:7: 'familie'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:22:5: ( 'familie' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:22:7: 'familie'
{
match("familie");
@@ -290,8 +290,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT24() throws RecognitionException {
try {
int _type = T24;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:23:5: ( 'keyword' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:23:7: 'keyword'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:23:5: ( 'keyword' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:23:7: 'keyword'
{
match("keyword");
@@ -309,8 +309,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mT25() throws RecognitionException {
try {
int _type = T25;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:24:5: ( ',' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:24:7: ','
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:24:5: ( ',' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:24:7: ','
{
match(',');
@@ -327,10 +327,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:11: ( '^' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -339,7 +339,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:12: '^'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:12: '^'
{
match('^');
@@ -358,7 +358,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
recover(mse); throw mse;
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:596:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -371,7 +371,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.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();
@@ -406,10 +406,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:10: ( ( '0' .. '9' )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:12: ( '0' .. '9' )+
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -423,7 +423,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:13: '0' .. '9'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:598:13: '0' .. '9'
{
matchRange('0','9');
@@ -453,7 +453,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -471,10 +471,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
{
match('\"');
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
loop4:
do {
int alt4=3;
@@ -490,7 +490,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600: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' ) {
@@ -507,7 +507,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:65: ~ ( '\\\\' | '\"' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:65: ~ ( '\\\\' | '\"' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -533,10 +533,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
{
match('\'');
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
loop5:
do {
int alt5=3;
@@ -552,7 +552,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600: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' ) {
@@ -569,7 +569,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:152: ~ ( '\\\\' | '\\'' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:600:152: ~ ( '\\\\' | '\\'' )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -607,12 +607,12 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -637,7 +637,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:52: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:602:52: .
{
matchAny();
@@ -666,12 +666,12 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:24: (~ ( '\\n' | '\\r' ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:24: (~ ( '\\n' | '\\r' ) )*
loop8:
do {
int alt8=2;
@@ -684,7 +684,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:24: ~ ( '\\n' | '\\r' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604: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();
@@ -705,7 +705,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
} while (true);
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:38: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:38: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -714,9 +714,9 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: ( '\\r' )? '\\n'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: ( '\\r' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -725,7 +725,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: '\\r'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:604:39: '\\r'
{
match('\r');
@@ -756,10 +756,10 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -773,7 +773,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
switch (alt11) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -813,8 +813,8 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:608:16: ( . )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:608:18: .
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:608:16: ( . )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:608:18: .
{
matchAny();
@@ -828,7 +828,7 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=22;
int LA12_0 = input.LA(1);
@@ -1276,154 +1276,154 @@ public class InternalReferenceGrammarTestLanguageLexer extends Lexer {
}
switch (alt12) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:10: T11
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:10: T11
{
mT11();
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:14: T12
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:14: T12
{
mT12();
}
break;
case 3 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:18: T13
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:18: T13
{
mT13();
}
break;
case 4 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:22: T14
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:22: T14
{
mT14();
}
break;
case 5 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:26: T15
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:26: T15
{
mT15();
}
break;
case 6 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:30: T16
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:30: T16
{
mT16();
}
break;
case 7 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:34: T17
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:34: T17
{
mT17();
}
break;
case 8 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:38: T18
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:38: T18
{
mT18();
}
break;
case 9 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:42: T19
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:42: T19
{
mT19();
}
break;
case 10 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:46: T20
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:46: T20
{
mT20();
}
break;
case 11 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:50: T21
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:50: T21
{
mT21();
}
break;
case 12 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:54: T22
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:54: T22
{
mT22();
}
break;
case 13 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:58: T23
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:58: T23
{
mT23();
}
break;
case 14 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:62: T24
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:62: T24
{
mT24();
}
break;
case 15 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:66: T25
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:66: T25
{
mT25();
}
break;
case 16 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:70: RULE_ID
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:70: RULE_ID
{
mRULE_ID();
}
break;
case 17 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:78: RULE_INT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:78: RULE_INT
{
mRULE_INT();
}
break;
case 18 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:87: RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:87: RULE_STRING
{
mRULE_STRING();
}
break;
case 19 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:99: RULE_ML_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:99: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 20 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:115: RULE_SL_COMMENT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:115: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 21 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:131: RULE_WS
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:131: RULE_WS
{
mRULE_WS();
}
break;
case 22 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:139: RULE_ANY_OTHER
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:1:139: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
index b1209a0..af1a600 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-19 13:25:17
+// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2009-01-04 17:09:30
package org.eclipse.xtext.testlanguages.parser.internal;
@@ -40,7 +40,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
public String[] getTokenNames() { return tokenNames; }
- public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g"; }
+ public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g"; }
@@ -64,7 +64,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
// $ANTLR start entryRuleSpielplatz
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:66:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:66:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ;
public final EObject entryRuleSpielplatz() throws RecognitionException {
EObject current = null;
@@ -72,8 +72,8 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:66:52: (iv_ruleSpielplatz= ruleSpielplatz EOF )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:67:2: iv_ruleSpielplatz= ruleSpielplatz EOF
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:66:52: (iv_ruleSpielplatz= ruleSpielplatz EOF )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:67:2: iv_ruleSpielplatz= ruleSpielplatz EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode);
pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz71);
@@ -99,7 +99,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
// $ANTLR start ruleSpielplatz
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:74:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )? ;
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:74:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )? ;
public final EObject ruleSpielplatz() throws RecognitionException {
EObject current = null;
@@ -116,10 +116,10 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:76:33: ( ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )? )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:76:33: ( ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )?
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}' )?
int alt5=2;
int LA5_0 = input.LA(1);
@@ -128,26 +128,26 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
switch (alt5) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* ) '}'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )* )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )*
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{'
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{'
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )?
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:6: 'spielplatz' (lv_groesse= RULE_INT )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:77:6: 'spielplatz' (lv_groesse= RULE_INT )
{
match(input,11,FOLLOW_11_in_ruleSpielplatz119);
createLeafNode("classpath:/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null);
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:81:1: (lv_groesse= RULE_INT )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:83:6: lv_groesse= RULE_INT
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:81:1: (lv_groesse= RULE_INT )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:83:6: lv_groesse= RULE_INT
{
lv_groesse=(Token)input.LT(1);
match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz140);
@@ -161,7 +161,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
try {
- factory.set(current, "groesse", lv_groesse,"INT");
+ factory.set(current, "groesse", lv_groesse, "INT", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -172,7 +172,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:101:3: (lv_beschreibung= RULE_STRING )?
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:101:3: (lv_beschreibung= RULE_STRING )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -181,7 +181,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
switch (alt1) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:103:6: lv_beschreibung= RULE_STRING
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:103:6: lv_beschreibung= RULE_STRING
{
lv_beschreibung=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz173);
@@ -195,7 +195,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
try {
- factory.set(current, "beschreibung", lv_beschreibung,"STRING");
+ factory.set(current, "beschreibung", lv_beschreibung, "STRING", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -216,7 +216,7 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:2: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )*
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:2: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )*
loop4:
do {
int alt4=3;
@@ -232,9 +232,9 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
switch (alt4) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:3: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:3: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:3: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:3: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )
int alt3=2;
int LA3_0 = input.LA(1);
@@ -252,9 +252,9 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
switch (alt3) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:4: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:4: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:4: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:4: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -272,10 +272,10 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
switch (alt2) {
case 1 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:5: (lv_kinder= ruleKind )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:5: (lv_kinder= ruleKind )
{
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:5: (lv_kinder= ruleKind )
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:128:6: lv_kinder= ruleKind
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:125:5: (lv_kinder= ruleKind )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:128:6: lv_kinder= ruleKind
{
currentNode=createCompositeNode("classpath:/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@groups.0/@groups.0/@terminal" /* xtext::RuleCall */, currentNode);
@@ -285,17 +285,17 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
_fsp--;
- currentNode = currentNode.getParent();
if (current==null) {
current = factory.create("Spielplatz");
- associateNodeWithAstElement(currentNode, current);
+ associateNodeWithAstElement(currentNode.getParent(), current);
}
try {
- factory.add(current, "kinder", lv_kinder,"Kind");
+ factory.add(current, "kinder", lv_kinder, "Kind", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
+ currentNode = currentNode.getParent();
}
@@ -304,10 +304,10 @@ public class InternalReferenceGrammarTestLanguageParser extends AbstractAntlrPar
}
break;
case 2 :
- // ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:147:6: (lv_erzieher= ruleErwachsener )
+ // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g:147:6: (lv_erzieher= ruleErwachsener )
{
-